diff --git a/apps/files/admin.php b/apps/files/admin.php
index f747f8645f6ca62bc63bace5d3d90a2846a46026..02c3147dba58cbe5bc17b13a63bd1da339e0b510 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -21,10 +21,6 @@
 *
 */
 
-
-// Init owncloud
-
-
 OCP\User::checkAdminUser();
 
 $htaccessWorking=(getenv('htaccessWorking')=='true');
diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php
deleted file mode 100644
index b32ba7c3d5bd620b87571e8b158176bebf283e3e..0000000000000000000000000000000000000000
--- a/apps/files/ajax/autocomplete.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-//provide auto completion of paths for use with jquer ui autocomplete
-
-
-// Init owncloud
-
-
-OCP\JSON::checkLoggedIn();
-
-// Get data
-$query = $_GET['term'];
-$dirOnly=(isset($_GET['dironly']))?($_GET['dironly']=='true'):false;
-
-if($query[0]!='/') {
-	$query='/'.$query;
-}
-
-if(substr($query, -1, 1)=='/') {
-	$base=$query;
-} else {
-	$base=dirname($query);
-}
-
-$query=substr($query, strlen($base));
-
-if($base!='/') {
-	$query=substr($query, 1);
-}
-$queryLen=strlen($query);
-$query=strtolower($query);
-
-// echo "$base - $query";
-
-$files=array();
-
-if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) {
-	$dh = OC_Filesystem::opendir($base);
-	if($dh) {
-		if(substr($base, -1, 1)!='/') {
-			$base=$base.'/';
-		}
-		while (($file = readdir($dh)) !== false) {
-			if ($file != "." && $file != "..") {
-				if(substr(strtolower($file), 0, $queryLen)==$query) {
-					$item=$base.$file;
-					if((!$dirOnly or OC_Filesystem::is_dir($item))) {
-						$files[]=(object)array('id'=>$item, 'label'=>$item, 'name'=>$item);
-					}
-				}
-			}
-		}
-	}
-}
-OCP\JSON::encodedPrint($files);
diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 6532b76df210940a94554db44bd50ac9e884d781..575b8c8d9eac9a15187f5364db8337fac846ef28 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -14,15 +14,18 @@ $files = json_decode($files);
 $filesWithError = '';
 $success = true;
 //Now delete
-foreach($files as $file) {
-	if( !OC_Files::delete( $dir, $file )) {
+foreach ($files as $file) {
+	if (!OC_Files::delete($dir, $file)) {
 		$filesWithError .= $file . "\n";
 		$success = false;
 	}
 }
 
-if($success) {
-	OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $files )));
+// get array with updated storage stats (e.g. max file size) after upload
+$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+
+if ($success) {
+	OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats)));
 } else {
-	OCP\JSON::error(array("data" => array( "message" => "Could not delete:\n" . $filesWithError )));
+	OCP\JSON::error(array("data" => array_merge(array("message" => "Could not delete:\n" . $filesWithError), $storageStats)));
 }
diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php
new file mode 100644
index 0000000000000000000000000000000000000000..7a2b642a9bd11296f64bc16afd1fb559dbde2443
--- /dev/null
+++ b/apps/files/ajax/getstoragestats.php
@@ -0,0 +1,9 @@
+<?php
+
+// only need filesystem apps
+$RUNTIME_APPTYPES = array('filesystem');
+
+OCP\JSON::checkLoggedIn();
+
+// send back json
+OCP\JSON::success(array('data' => \OCA\files\lib\Helper::buildFileStorageStatistics('/')));
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 5cd9572d7f99eb3328cfb53edff52f6d98b9834a..a819578e3092fd221572a44222883b0a4e58aa1a 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -6,13 +6,14 @@ $force=isset($_GET['force']) and $_GET['force']=='true';
 $dir=isset($_GET['dir'])?$_GET['dir']:'';
 $checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true';
 
+$eventSource=false;
 if(!$checkOnly) {
 	$eventSource=new OC_EventSource();
 }
 
 session_write_close();
 
-//create the file cache if necesary
+//create the file cache if necessary
 if($force or !OC_FileCache::inCache('')) {
 	if(!$checkOnly) {
 		OCP\DB::beginTransaction();
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 2a2d935da6c6f78314e8cb4fa3690e2743c2dd6d..415524be6293aa40a9add10121facc6c7403bcb9 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -8,65 +8,73 @@ OCP\JSON::setContentTypeHeader('text/plain');
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
-$l=OC_L10N::get('files');
+$l = OC_L10N::get('files');
+
+// get array with current storage stats (e.g. max file size)
+$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
 
 if (!isset($_FILES['files'])) {
-	OCP\JSON::error(array('data' => array( 'message' => $l->t( 'No file was uploaded. Unknown error' ))));
+	OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('No file was uploaded. Unknown error')), $storageStats)));
 	exit();
 }
 
 foreach ($_FILES['files']['error'] as $error) {
 	if ($error != 0) {
 		$errors = array(
-			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_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'),
-			UPLOAD_ERR_CANT_WRITE=>$l->t('Failed to write to disk'),
+			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_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'),
+			UPLOAD_ERR_CANT_WRITE => $l->t('Failed to write to disk'),
 		);
-		OCP\JSON::error(array('data' => array( 'message' => $errors[$error] )));
+		OCP\JSON::error(array('data' => array_merge(array('message' => $errors[$error]), $storageStats)));
 		exit();
 	}
 }
-$files=$_FILES['files'];
+$files = $_FILES['files'];
 
 $dir = $_POST['dir'];
-$error='';
+$error = '';
 
-$totalSize=0;
-foreach($files['size'] as $size) {
-	$totalSize+=$size;
+$totalSize = 0;
+foreach ($files['size'] as $size) {
+	$totalSize += $size;
 }
-if($totalSize>OC_Filesystem::free_space($dir)) {
-	OCP\JSON::error(array('data' => array( 'message' => $l->t( 'Not enough space available' ))));
+if ($totalSize > OC_Filesystem::free_space($dir)) {
+	OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('Not enough storage available')), $storageStats)));
 	exit();
 }
 
-$result=array();
-if(strpos($dir, '..') === false) {
-	$fileCount=count($files['name']);
-	for($i=0;$i<$fileCount;$i++) {
+$result = array();
+if (strpos($dir, '..') === false) {
+	$fileCount = count($files['name']);
+	for ($i = 0; $i < $fileCount; $i++) {
 		$target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
 		// $path needs to be normalized - this failed within drag'n'drop upload to a sub-folder
 		$target = OC_Filesystem::normalizePath($target);
-		if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
+		if (is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
 			$meta = OC_FileCache::get($target);
 			$id = OC_FileCache::getId($target);
-			$result[]=array( 'status' => 'success',
-				'mime'=>$meta['mimetype'],
-				'size'=>$meta['size'],
-				'id'=>$id,
-				'name'=>basename($target));
+
+			// updated max file size after upload
+			$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+
+			$result[] = array_merge(array('status' => 'success',
+										  'mime'   => $meta['mimetype'],
+										  'size'   => $meta['size'],
+										  'id'     => $id,
+										  'name'   => basename($target)), $storageStats
+			);
 		}
 	}
 	OCP\JSON::encodedPrint($result);
 	exit();
 } else {
-	$error=$l->t( 'Invalid directory.' );
+	$error = $l->t('Invalid directory.');
 }
 
-OCP\JSON::error(array('data' => array('message' => $error )));
+OCP\JSON::error(array('data' => array_merge(array('message' => $error), $storageStats)));
diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 36a1e5c954b9ae4935c5e2ef72578e96e173a1e8..e65f724f688fbd7e4dc3e399a6cb839d2974e6b2 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -23,7 +23,7 @@
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
 
-#upload { 
+#upload {
 	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
 }
 #upload a {
@@ -35,7 +35,7 @@
 }
 .file_upload_target { display:none; }
 .file_upload_form { display:inline; float:left; margin:0; padding:0; cursor:pointer; overflow:visible; }
-#file_upload_start { 
+#file_upload_start {
 	left:0; top:0; width:28px; height:27px; padding:0;
 	font-size:1em;
 	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0;
@@ -104,7 +104,7 @@ table td.filename form { font-size:.85em; margin-left:3em; margin-right:3em; }
 #fileList tr:hover .fileactions { /* background to distinguish when overlaying with file names */
 	background:rgba(248,248,248,.9); box-shadow:-5px 0 7px rgba(248,248,248,.9);
 }
-#fileList tr.selected:hover .fileactions { /* slightly darker color for selected rows */
+#fileList tr.selected:hover .fileactions, #fileList tr.mouseOver .fileactions { /* slightly darker color for selected rows */
 	background:rgba(238,238,238,.9); box-shadow:-5px 0 7px rgba(238,238,238,.9);
 }
 #fileList .fileactions a.action img { position:relative; top:.2em; }
diff --git a/apps/files/download.php b/apps/files/download.php
index e2149cd41350df0eca92346d5eca1ffd9611be25..1b70b1e38f891137c27c8ddd8c445ebb5fa4ef4e 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -21,9 +21,6 @@
 *
 */
 
-// Init owncloud
-
-
 // Check if we are a user
 OCP\User::checkLoggedIn();
 
diff --git a/apps/files/index.php b/apps/files/index.php
index b64bde44cc0def096f927d3bc586c1208525ac9e..e3197b9e3c0aa25d4c2597dda4e6e1d8d0a9f313 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -28,6 +28,7 @@ OCP\User::checkLoggedIn();
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
 OCP\Util::addscript('files', 'jquery.fileupload');
+OCP\Util::addscript('files', 'jquery-visibility');
 OCP\Util::addscript('files', 'files');
 OCP\Util::addscript('files', 'filelist');
 OCP\Util::addscript('files', 'fileactions');
@@ -38,36 +39,36 @@ OCP\App::setActiveNavigationEntry('files_index');
 $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : '';
 // Redirect if directory does not exist
 if (!OC_Filesystem::is_dir($dir . '/')) {
-    header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
-    exit();
+	header('Location: ' . $_SERVER['SCRIPT_NAME'] . '');
+	exit();
 }
 
 $files = array();
 foreach (OC_Files::getdirectorycontent($dir) as $i) {
-    $i['date'] = OCP\Util::formatDate($i['mtime']);
-    if ($i['type'] == 'file') {
-        $fileinfo = pathinfo($i['name']);
-        $i['basename'] = $fileinfo['filename'];
-        if (!empty($fileinfo['extension'])) {
-            $i['extension'] = '.' . $fileinfo['extension'];
-        } else {
-            $i['extension'] = '';
-        }
-    }
-    if ($i['directory'] == '/') {
-        $i['directory'] = '';
-    }
-    $files[] = $i;
+	$i['date'] = OCP\Util::formatDate($i['mtime']);
+	if ($i['type'] == 'file') {
+		$fileinfo = pathinfo($i['name']);
+		$i['basename'] = $fileinfo['filename'];
+		if (!empty($fileinfo['extension'])) {
+			$i['extension'] = '.' . $fileinfo['extension'];
+		} else {
+			$i['extension'] = '';
+		}
+	}
+	if ($i['directory'] == '/') {
+		$i['directory'] = '';
+	}
+	$files[] = $i;
 }
 
 // Make breadcrumb
 $breadcrumb = array();
 $pathtohere = '';
 foreach (explode('/', $dir) as $i) {
-    if ($i != '') {
-        $pathtohere .= '/' . $i;
-        $breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
-    }
+	if ($i != '') {
+		$pathtohere .= '/' . $i;
+		$breadcrumb[] = array('dir' => $pathtohere, 'name' => $i);
+	}
 }
 
 // make breadcrumb und filelist markup
@@ -75,29 +76,30 @@ $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::linkTo('files', 'download.php') . '?file=', false);
+$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);
 
-$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
-$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
-$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
-
-$freeSpace = OC_Filesystem::free_space($dir);
-$freeSpace = max($freeSpace, 0);
-$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
+$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
 
 $permissions = OCP\PERMISSION_READ;
+if (OC_Filesystem::isCreatable($dir . '/')) {
+	$permissions |= OCP\PERMISSION_CREATE;
+}
 if (OC_Filesystem::isUpdatable($dir . '/')) {
-    $permissions |= OCP\PERMISSION_UPDATE;
+	$permissions |= OCP\PERMISSION_UPDATE;
 }
 if (OC_Filesystem::isDeletable($dir . '/')) {
-    $permissions |= OCP\PERMISSION_DELETE;
+	$permissions |= OCP\PERMISSION_DELETE;
 }
 if (OC_Filesystem::isSharable($dir . '/')) {
-    $permissions |= OCP\PERMISSION_SHARE;
+	$permissions |= OCP\PERMISSION_SHARE;
 }
 
+// information about storage capacities
+$storageInfo=OC_Helper::getStorageInfo();
+
 $tmpl = new OCP\Template('files', 'index', 'user');
 $tmpl->assign('fileList', $list->fetchPage(), false);
 $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false);
@@ -108,4 +110,5 @@ $tmpl->assign('files', $files);
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
+$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']);
 $tmpl->printPage();
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 80b9c01f83887176e554ebb72ef29513a88ede99..f5ee363a4c82e7fd2da9107c6105a03eb98482f5 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -70,23 +70,23 @@ var FileActions = {
 		}
 		parent.children('a.name').append('<span class="fileactions" />');
 		var defaultAction = FileActions.getDefault(FileActions.getCurrentMimeType(), FileActions.getCurrentType(), FileActions.getCurrentPermissions());
-		
+
 		var actionHandler = function (event) {
 			event.stopPropagation();
 			event.preventDefault();
 
 			FileActions.currentFile = event.data.elem;
 			var file = FileActions.getCurrentFile();
-			
+
 			event.data.actionFunc(file);
 		};
-		
+
 		$.each(actions, function (name, action) {
 			// NOTE: Temporary fix to prevent rename action in root of Shared directory
 			if (name === 'Rename' && $('#dir').val() === '/Shared') {
 				return true;
 			}
-			
+
 			if ((name === 'Download' || action !== defaultAction) && name !== 'Delete') {
 				var img = FileActions.icons[name];
 				if (img.call) {
@@ -97,16 +97,16 @@ var FileActions = {
 					html += '<img class ="svg" src="' + img + '" /> ';
 				}
 				html += t('files', name) + '</a>';
-				
+
 				var element = $(html);
 				element.data('action', name);
 				//alert(element);
 				element.on('click',{a:null, elem:parent, actionFunc:actions[name]},actionHandler);
 				parent.find('a.name>span.fileactions').append(element);
 			}
-			
+
 		});
-		
+
 		if (actions['Delete']) {
 			var img = FileActions.icons['Delete'];
 			if (img.call) {
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 66697bbbf56fd3678008f89aad09995612db49e7..04b7d92e2c35065af78f9a98dc8565c19e9d88fe 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -201,15 +201,14 @@ var FileList={
 	},
 	checkName:function(oldName, newName, isNewFile) {
 		if (isNewFile || $('tr').filterAttr('data-file', newName).length > 0) {
-			if (isNewFile) {
-				$('#notification').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><span class="cancel">'+t('files', 'cancel')+'</span>');
-			} else {
-				$('#notification').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>');
-			}
 			$('#notification').data('oldName', oldName);
 			$('#notification').data('newName', newName);
 			$('#notification').data('isNewFile', isNewFile);
-			$('#notification').fadeIn();
+            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>');
+            }
 			return true;
 		} else {
 			return false;
@@ -251,11 +250,10 @@ var FileList={
 			FileList.finishReplace();
 		};
 		if (isNewFile) {
-			$('#notification').html(t('files', 'replaced {new_name}', {new_name: newName})+'<span class="undo">'+t('files', 'undo')+'</span>');
+			OC.Notification.showHtml(t('files', 'replaced {new_name}', {new_name: newName})+'<span class="undo">'+t('files', 'undo')+'</span>');
 		} else {
-			$('#notification').html(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
+            OC.Notification.showHtml(t('files', 'replaced {new_name} with {old_name}', {new_name: newName}, {old_name: oldName})+'<span class="undo">'+t('files', 'undo')+'</span>');
 		}
-		$('#notification').fadeIn();
 	},
 	finishReplace:function() {
 		if (!FileList.replaceCanceled && FileList.replaceOldName && FileList.replaceNewName) {
@@ -285,11 +283,10 @@ var FileList={
 		} else {
 			// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
 			if ($('#dir').val() == '/Shared') {
-				$('#notification').html(t('files', 'unshared {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
+				OC.Notification.showHtml(t('files', 'unshared {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
 			} else {
-				$('#notification').html(t('files', 'deleted {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
+                OC.Notification.showHtml(t('files', 'deleted {files}', {'files': escapeHTML(files)})+'<span class="undo">'+t('files', 'undo')+'</span>');
 			}
-			$('#notification').fadeIn();
 		}
 	},
 	finishDelete:function(ready,sync){
@@ -302,7 +299,7 @@ var FileList={
 				data: {dir:$('#dir').val(),files:fileNames},
 				complete: function(data){
 					boolOperationFinished(data, function(){
-						$('#notification').fadeOut('400');
+                        OC.Notification.hide();
 						$.each(FileList.deleteFiles,function(index,file){
 							FileList.remove(file);
 						});
@@ -362,16 +359,16 @@ $(document).ready(function(){
 			FileList.replaceIsNewFile = null;
 		}
 		FileList.lastAction = null;
-		$('#notification').fadeOut('400');
+        OC.Notification.hide();
 	});
 	$('#notification .replace').live('click', function() {
-		$('#notification').fadeOut('400', function() {
-			FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'), $('#notification').data('isNewFile'));
-		});
+        OC.Notification.hide(function() {
+            FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'), $('#notification').data('isNewFile'));
+        });
 	});
 	$('#notification .suggest').live('click', function() {
 		$('tr').filterAttr('data-file', $('#notification').data('oldName')).show();
-		$('#notification').fadeOut('400');
+        OC.Notification.hide();
 	});
 	$('#notification .cancel').live('click', function() {
 		if ($('#notification').data('isNewFile')) {
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index bb298431e84afe1ea6d1c965574baea96451942c..c817d8431e29cd13bf5b8322d2fb14a59451668a 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -26,15 +26,34 @@ Files={
 		});
 		procesSelection();
 	},
+	updateMaxUploadFilesize:function(response) {
+		if(response == undefined) {
+			return;
+		}
+		if(response.data !== undefined && response.data.uploadMaxFilesize !== undefined) {
+			$('#max_upload').val(response.data.uploadMaxFilesize);
+			$('#upload.button').attr('original-title', response.data.maxHumanFilesize);
+			$('#usedSpacePercent').val(response.data.usedSpacePercent);
+			Files.displayStorageWarnings();
+		}
+		if(response[0] == undefined) {
+			return;
+		}
+		if(response[0].uploadMaxFilesize !== undefined) {
+			$('#max_upload').val(response[0].uploadMaxFilesize);
+			$('#upload.button').attr('original-title', response[0].maxHumanFilesize);
+			$('#usedSpacePercent').val(response[0].usedSpacePercent);
+			Files.displayStorageWarnings();
+		}
+
+	},
 	isFileNameValid:function (name) {
 		if (name === '.') {
-			$('#notification').text(t('files', '\'.\' is an invalid file name.'));
-			$('#notification').fadeIn();
+			OC.Notification.show(t('files', '\'.\' is an invalid file name.'));
 			return false;
 		}
 		if (name.length == 0) {
-			$('#notification').text(t('files', 'File name cannot be empty.'));
-			$('#notification').fadeIn();
+			OC.Notification.show(t('files', 'File name cannot be empty.'));
 			return false;
 		}
 
@@ -42,17 +61,30 @@ Files={
 		var invalid_characters = ['\\', '/', '<', '>', ':', '"', '|', '?', '*'];
 		for (var i = 0; i < invalid_characters.length; i++) {
 			if (name.indexOf(invalid_characters[i]) != -1) {
-				$('#notification').text(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
-				$('#notification').fadeIn();
+				OC.Notification.show(t('files', "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed."));
 				return false;
 			}
 		}
-		$('#notification').fadeOut();
+		OC.Notification.hide();
 		return true;
+	},
+	displayStorageWarnings: function() {
+		if (!OC.Notification.isHidden()) {
+			return;
+		}
+
+		var usedSpacePercent = $('#usedSpacePercent').val();
+		if (usedSpacePercent > 98) {
+			OC.Notification.show(t('files', 'Your storage is full, files can not be updated or synced anymore!'));
+			return;
+		}
+		if (usedSpacePercent > 90) {
+			OC.Notification.show(t('files', 'Your storage is almost full ({usedSpacePercent}%)', {usedSpacePercent: usedSpacePercent}));
+		}
 	}
 };
 $(document).ready(function() {
-	Files.bindKeyboardShortcuts(document, jQuery); 
+	Files.bindKeyboardShortcuts(document, jQuery);
 	$('#fileList tr').each(function(){
 		//little hack to set unescape filenames in attribute
 		$(this).attr('data-file',decodeURIComponent($(this).attr('data-file')));
@@ -87,8 +119,8 @@ $(document).ready(function() {
 
 	// Sets the file link behaviour :
 	$('td.filename a').live('click',function(event) {
-		event.preventDefault();
 		if (event.ctrlKey || event.shiftKey) {
+			event.preventDefault();
 			if (event.shiftKey) {
 				var last = $(lastChecked).parent().parent().prevAll().length;
 				var first = $(this).parent().parent().prevAll().length;
@@ -130,6 +162,7 @@ $(document).ready(function() {
 				var permissions = $(this).parent().parent().data('permissions');
 				var action=FileActions.getDefault(mime,type, permissions);
 				if(action){
+					event.preventDefault();
 					action(filename);
 				}
 			}
@@ -183,8 +216,7 @@ $(document).ready(function() {
 	$('.download').click('click',function(event) {
 		var files=getSelectedFiles('name').join(';');
 		var dir=$('#dir').val()||'/';
-		$('#notification').text(t('files','generating ZIP-file, it may take some time.'));
-		$('#notification').fadeIn();
+		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;
@@ -313,9 +345,9 @@ $(document).ready(function() {
 											var response;
 											response=jQuery.parseJSON(result);
 											if(response[0] == undefined || response[0].status != 'success') {
-												$('#notification').text(t('files', response.data.message));
-												$('#notification').fadeIn();
+												OC.Notification.show(t('files', response.data.message));
 											}
+											Files.updateMaxUploadFilesize(response);
 											var file=response[0];
 											// TODO: this doesn't work if the file name has been changed server side
 											delete uploadingFiles[dirName][file.name];
@@ -353,9 +385,7 @@ $(document).ready(function() {
 											uploadtext.text(t('files', '{count} files uploading', {count: currentUploads}));
 										}
 										delete uploadingFiles[dirName][fileName];
-										$('#notification').hide();
-										$('#notification').text(t('files', 'Upload cancelled.'));
-										$('#notification').fadeIn();
+										OC.Notification.show(t('files', 'Upload cancelled.'));
 									}
 								});
 								//TODO test with filenames containing slashes
@@ -368,6 +398,8 @@ $(document).ready(function() {
 										.success(function(result, textStatus, jqXHR) {
 											var response;
 											response=jQuery.parseJSON(result);
+											Files.updateMaxUploadFilesize(response);
+
 											if(response[0] != undefined && response[0].status == 'success') {
 												var file=response[0];
 												delete uploadingFiles[file.name];
@@ -380,20 +412,17 @@ $(document).ready(function() {
 												FileList.loadingDone(file.name, file.id);
 											} else {
 												Files.cancelUpload(this.files[0].name);
-												$('#notification').text(t('files', response.data.message));
-												$('#notification').fadeIn();
+												OC.Notification.show(t('files', response.data.message));
 												$('#fileList > tr').not('[data-mime]').fadeOut();
 												$('#fileList > tr').not('[data-mime]').remove();
 											}
-										})
-								.error(function(jqXHR, textStatus, errorThrown) {
-									if(errorThrown === 'abort') {
-										Files.cancelUpload(this.files[0].name);
-										$('#notification').hide();
-										$('#notification').text(t('files', 'Upload cancelled.'));
-										$('#notification').fadeIn();
-									}
-								});
+									})
+									.error(function(jqXHR, textStatus, errorThrown) {
+										if(errorThrown === 'abort') {
+											Files.cancelUpload(this.files[0].name);
+											OC.Notification.show(t('files', 'Upload cancelled.'));
+										}
+									});
 								uploadingFiles[uniqueName] = jqXHR;
 							}
 						}
@@ -401,6 +430,7 @@ $(document).ready(function() {
 						data.submit().success(function(data, status) {
 							// in safari data is a string
 							response = jQuery.parseJSON(typeof data === 'string' ? data : data[0].body.innerText);
+							Files.updateMaxUploadFilesize(response);
 							if(response[0] != undefined && response[0].status == 'success') {
 								var file=response[0];
 								delete uploadingFiles[file.name];
@@ -413,8 +443,7 @@ $(document).ready(function() {
 								FileList.loadingDone(file.name, file.id);
 							} else {
 								//TODO Files.cancelUpload(/*where do we get the filename*/);
-								$('#notification').text(t('files', response.data.message));
-								$('#notification').fadeIn();
+								OC.Notification.show(t('files', response.data.message));
 								$('#fileList > tr').not('[data-mime]').fadeOut();
 								$('#fileList > tr').not('[data-mime]').remove();
 							}
@@ -433,6 +462,10 @@ $(document).ready(function() {
 				$('#uploadprogressbar').progressbar('value',progress);
 			},
 			start: function(e, data) {
+				//IE < 10 does not fire the necessary events for the progress bar.
+				if($.browser.msie && parseInt($.browser.version) < 10) {
+					return;
+				}
 				$('#uploadprogressbar').progressbar({value:0});
 				$('#uploadprogressbar').fadeIn();
 				if(data.dataType != 'iframe ') {
@@ -534,14 +567,12 @@ $(document).ready(function() {
 			event.preventDefault();
 			var newname=input.val();
 			if(type == 'web' && newname.length == 0) {
-				$('#notification').text(t('files', 'URL cannot be empty.'));
-				$('#notification').fadeIn();
+				OC.Notification.show(t('files', 'URL cannot be empty.'));
 				return false;
 			} else if (type != 'web' && !Files.isFileNameValid(newname)) {
 				return false;
 			} else if( type == 'folder' && $('#dir').val() == '/' && newname == 'Shared') {
-				$('#notification').text(t('files','Invalid folder name. Usage of \'Shared\' is reserved by Owncloud'));
-				$('#notification').fadeIn();
+				OC.Notification.show(t('files','Invalid folder name. Usage of \'Shared\' is reserved by Owncloud'));
 				return false;
 			}
 			if (FileList.lastAction) {
@@ -711,6 +742,36 @@ $(document).ready(function() {
 	});
 
 	resizeBreadcrumbs(true);
+
+	// display storage warnings
+	setTimeout ( "Files.displayStorageWarnings()", 100 );
+	OC.Notification.setDefault(Files.displayStorageWarnings);
+
+	// file space size sync
+	function update_storage_statistics() {
+		$.getJSON(OC.filePath('files','ajax','getstoragestats.php'),function(response) {
+			Files.updateMaxUploadFilesize(response);
+		});
+	}
+
+	// start on load - we ask the server every 5 minutes
+	var update_storage_statistics_interval = 5*60*1000;
+	var update_storage_statistics_interval_id = setInterval(update_storage_statistics, update_storage_statistics_interval);
+
+	// Use jquery-visibility to de-/re-activate file stats sync
+	if ($.support.pageVisibility) {
+		$(document).on({
+			'show.visibility': function() {
+				if (!update_storage_statistics_interval_id) {
+					update_storage_statistics_interval_id = setInterval(update_storage_statistics, update_storage_statistics_interval);
+				}
+			},
+			'hide.visibility': function() {
+				clearInterval(update_storage_statistics_interval_id);
+				update_storage_statistics_interval_id = 0;
+			}
+		});
+	}
 });
 
 function scanFiles(force,dir){
@@ -740,6 +801,7 @@ scanFiles.scanning=false;
 
 function boolOperationFinished(data, callback) {
 	result = jQuery.parseJSON(data.responseText);
+	Files.updateMaxUploadFilesize(result);
 	if(result.status == 'success'){
 		callback.call();
 	} else {
diff --git a/apps/files/js/jquery-visibility.js b/apps/files/js/jquery-visibility.js
new file mode 100644
index 0000000000000000000000000000000000000000..a824bf6873076b284def2bd5a47c1d6ae52a5611
--- /dev/null
+++ b/apps/files/js/jquery-visibility.js
@@ -0,0 +1,32 @@
+/*! http://mths.be/visibility v1.0.5 by @mathias */
+(function (window, document, $, undefined) {
+
+	var prefix,
+		property,
+// In Opera, `'onfocusin' in document == true`, hence the extra `hasFocus` check to detect IE-like behavior
+		eventName = 'onfocusin' in document && 'hasFocus' in document ? 'focusin focusout' : 'focus blur',
+		prefixes = ['', 'moz', 'ms', 'o', 'webkit'],
+		$support = $.support,
+		$event = $.event;
+
+	while ((property = prefix = prefixes.pop()) != undefined) {
+		property = (prefix ? prefix + 'H' : 'h') + 'idden';
+		if ($support.pageVisibility = typeof document[property] == 'boolean') {
+			eventName = prefix + 'visibilitychange';
+			break;
+		}
+	}
+
+	$(/blur$/.test(eventName) ? window : document).on(eventName, function (event) {
+		var type = event.type,
+			originalEvent = event.originalEvent,
+			toElement = originalEvent.toElement;
+// If itâ€™s a `{focusin,focusout}` event (IE), `fromElement` and `toElement` should both be `null` or `undefined`;
+// else, the page visibility hasnâ€™t changed, but the user just clicked somewhere in the doc.
+// In IE9, we need to check the `relatedTarget` property instead.
+		if (!/^focus./.test(type) || (toElement == undefined && originalEvent.fromElement == undefined && originalEvent.relatedTarget == undefined)) {
+			$event.trigger((property && document[property] || /^(?:blur|focusout)$/.test(type) ? 'hide' : 'show') + '.visibility');
+		}
+	});
+
+}(this, document, jQuery));
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 5740d54f8b1b13c3015ac0451c7ef1353783c24f..b741815be458d781049689f6504260952e9b4af4 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -11,12 +11,12 @@
 "Name" => "Ø§Ù„Ø§Ø³Ù…",
 "Size" => "ØØ¬Ù…",
 "Modified" => "Ù…Ø¹Ø¯Ù„",
+"Upload" => "Ø¥Ø±ÙØ¹",
 "Maximum upload size" => "Ø§Ù„ØØ¯ Ø§Ù„Ø£Ù‚ØµÙ‰ Ù„ØØ¬Ù… Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„ØªÙŠ ÙŠÙ…ÙƒÙ† Ø±ÙØ¹Ù‡Ø§",
 "Save" => "ØÙØ¸",
 "New" => "Ø¬Ø¯ÙŠØ¯",
 "Text file" => "Ù…Ù„Ù",
 "Folder" => "Ù…Ø¬Ù„Ø¯",
-"Upload" => "Ø¥Ø±ÙØ¹",
 "Nothing in here. Upload something!" => "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø´ÙŠØ¡ Ù‡Ù†Ø§. Ø¥Ø±ÙØ¹ Ø¨Ø¹Ø¶ Ø§Ù„Ù…Ù„ÙØ§Øª!",
 "Download" => "ØªØÙ…ÙŠÙ„",
 "Upload too large" => "ØØ¬Ù… Ø§Ù„ØªØ±ÙÙŠØ¹ Ø£Ø¹Ù„Ù‰ Ù…Ù† Ø§Ù„Ù…Ø³Ù…ÙˆØ",
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index bc10979611b2953c63c7b1003bcdc47f7f3b7b4c..ae49f5169992c6cd93d22c41dd9da060f90afc49 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -10,12 +10,12 @@
 "Name" => "Ð˜Ð¼Ðµ",
 "Size" => "Ð Ð°Ð·Ð¼ÐµÑ€",
 "Modified" => "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¾",
+"Upload" => "ÐšÐ°Ñ‡Ð²Ð°Ð½Ðµ",
 "Maximum upload size" => "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÐµÐ½ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð·Ð° ÐºÐ°Ñ‡Ð²Ð°Ð½Ðµ",
 "0 is unlimited" => "ÐŸÐ¾Ð»Ð·Ð²Ð°Ð¹Ñ‚Ðµ 0 Ð·Ð° Ð±ÐµÐ· Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð¸Ñ",
 "Save" => "Ð—Ð°Ð¿Ð¸Ñ",
 "New" => "ÐÐ¾Ð²Ð¾",
 "Folder" => "ÐŸÐ°Ð¿ÐºÐ°",
-"Upload" => "ÐšÐ°Ñ‡Ð²Ð°Ð½Ðµ",
 "Nothing in here. Upload something!" => "ÐÑÐ¼Ð° Ð½Ð¸Ñ‰Ð¾ Ñ‚ÑƒÐº. ÐšÐ°Ñ‡ÐµÑ‚Ðµ Ð½ÐµÑ‰Ð¾.",
 "Download" => "Ð˜Ð·Ñ‚ÐµÐ³Ð»ÑÐ½Ðµ",
 "Upload too large" => "Ð¤Ð°Ð¹Ð»ÑŠÑ‚ ÐºÐ¾Ð¹Ñ‚Ð¾ ÑÑ‚Ðµ Ð¸Ð·Ð±Ñ€Ð°Ð»Ð¸ Ð·Ð° ÐºÐ°Ñ‡Ð²Ð°Ð½Ðµ Ðµ Ð¿Ñ€ÐµÐºÐ°Ð»ÐµÐ½Ð¾ Ð³Ð¾Ð»ÑÐ¼"
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
index e55c8811393e8f3e829afd2bd834ce427fda613a..d59463bb7a02c3478790ee5f4e41167e563ee34d 100644
--- a/apps/files/l10n/bn_BD.php
+++ b/apps/files/l10n/bn_BD.php
@@ -10,7 +10,6 @@
 "No file was uploaded" => "à¦•à§‹à¦¨ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à§Ÿ à¦¨à¦¿",
 "Missing a temporary folder" => "à¦…à¦¸à§à¦¥à¦¾à§Ÿà§€ à¦«à§‹à¦²à§à¦¡à¦¾à¦° à¦–à§‹à§Ÿà¦¾ à¦—à¦¿à§Ÿà§‡à¦›à§‡",
 "Failed to write to disk" => "à¦¡à¦¿à¦¸à§à¦•à§‡ à¦²à¦¿à¦–à¦¤à§‡ à¦¬à§à¦¯à¦°à§à¦¥",
-"Not enough space available" => "à¦¯à¦¥à§‡à¦·à§à¦  à¦ªà¦°à¦¿à¦®à¦¾à¦£ à¦¸à§à¦¥à¦¾à¦¨ à¦¨à§‡à¦‡",
 "Invalid directory." => "à¦à§à¦² à¦¡à¦¿à¦°à§‡à¦•à§à¦Ÿà¦°à¦¿",
 "Files" => "à¦«à¦¾à¦‡à¦²",
 "Unshare" => "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² ",
@@ -28,7 +27,6 @@
 "'.' is an invalid file name." => "à¦Ÿà¦¿ à¦à¦•à¦Ÿà¦¿ à¦…à¦¨à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à¦¾à¦®à¥¤",
 "File name cannot be empty." => "à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦«à¦¾à¦à¦•à¦¾ à¦°à¦¾à¦–à¦¾ à¦¯à¦¾à¦¬à§‡ à¦¨à¦¾à¥¤",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦¸à¦ à¦¿à¦• à¦¨à§Ÿ,  '\\', '/', '<', '>', ':', '\"', '|', '?' à¦à¦¬à¦‚  '*'  à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à§Ÿà¥¤",
-"generating ZIP-file, it may take some time." => "ZIP- à¦«à¦¾à¦‡à¦² à¦¤à§ˆà¦°à§€ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦à¦œà¦¨à§à¦¯ à¦•à¦¿à¦›à§ à¦¸à¦®à§Ÿ à¦†à¦¬à¦¶à§à¦¯à¦•à¥¤",
 "Unable to upload your file as it is a directory or has 0 bytes" => "à¦†à¦ªà¦¨à¦¾à¦° à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¹à¦²à§‹ à¦¨à¦¾, à¦•à§‡à¦¨à¦¨à¦¾ à¦à¦Ÿà¦¿ à¦¹à§Ÿ à¦à¦•à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦° à¦•à¦¿à¦‚à¦¬à¦¾ à¦à¦° à¦†à¦•à¦¾à¦° à§¦ à¦¬à¦¾à¦‡à¦Ÿ",
 "Upload Error" => "à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ ",
 "Close" => "à¦¬à¦¨à§à¦§",
@@ -48,6 +46,7 @@
 "{count} folders" => "{count} à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°",
 "1 file" => "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²",
 "{count} files" => "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²",
+"Upload" => "à¦†à¦ªà¦²à§‹à¦¡",
 "File handling" => "à¦«à¦¾à¦‡à¦² à¦¹à§à¦¯à¦¾à¦°à§à¦¡à¦²à¦¿à¦‚",
 "Maximum upload size" => "à¦†à¦ªà¦²à§‹à¦¡à§‡à¦° à¦¸à¦°à§à¦¬à§‹à¦šà§à¦š à¦†à¦•à¦¾à¦°",
 "max. possible: " => "à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤  à¦¸à¦°à§à¦¬à§‹à¦šà§à¦š  à¦†à¦•à¦¾à¦°",
@@ -60,7 +59,6 @@
 "Text file" => "à¦Ÿà§‡à¦•à§à¦¸à¦Ÿ à¦«à¦¾à¦‡à¦²",
 "Folder" => "à¦«à§‹à¦²à§à¦¡à¦¾à¦°",
 "From link" => " à¦²à¦¿à¦‚à¦• à¦¥à§‡à¦•à§‡",
-"Upload" => "à¦†à¦ªà¦²à§‹à¦¡",
 "Cancel upload" => "à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°",
 "Nothing in here. Upload something!" => "à¦à¦–à¦¾à¦¨à§‡ à¦•à¦¿à¦›à§à¦‡ à¦¨à§‡à¦‡à¥¤ à¦•à¦¿à¦›à§ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à§à¦¨ !",
 "Download" => "à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index f6ddbcd8e189ef49fa665dc05e1d260640f8fef3..ceec02647887b2319b0056752481ff0435d335e6 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -10,7 +10,7 @@
 "No file was uploaded" => "El fitxer no s'ha pujat",
 "Missing a temporary folder" => "S'ha perdut un fitxer temporal",
 "Failed to write to disk" => "Ha fallat en escriure al disc",
-"Not enough space available" => "No hi ha prou espai disponible",
+"Not enough storage available" => "No hi ha prou espai disponible",
 "Invalid directory." => "Directori no vÃ lid.",
 "Files" => "Fitxers",
 "Unshare" => "Deixa de compartir",
@@ -28,7 +28,9 @@
 "'.' is an invalid file name." => "'.' Ã©s un nom no vÃ lid per un fitxer.",
 "File name cannot be empty." => "El nom del fitxer no pot ser buit.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nÃ³m no Ã©s vÃ lid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
-"generating ZIP-file, it may take some time." => "s'estan generant fitxers ZIP, pot trigar una estona.",
+"Your storage is full, files can not be updated or synced anymore!" => "El vostre espai d'emmagatzemament Ã©s ple, els fitxers ja no es poden actualitzar o sincronitzar!",
+"Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament Ã©s gairebÃ© ple ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "S'estÃ  preparant la baixada. Pot trigar una estona si els fitxers sÃ³n grans.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No es pot pujar el fitxer perquÃ¨ Ã©s una carpeta o tÃ© 0 bytes",
 "Upload Error" => "Error en la pujada",
 "Close" => "Tanca",
@@ -48,6 +50,7 @@
 "{count} folders" => "{count} carpetes",
 "1 file" => "1 fitxer",
 "{count} files" => "{count} fitxers",
+"Upload" => "Puja",
 "File handling" => "GestiÃ³ de fitxers",
 "Maximum upload size" => "Mida mÃ xima de pujada",
 "max. possible: " => "mÃ xim possible:",
@@ -60,7 +63,6 @@
 "Text file" => "Fitxer de text",
 "Folder" => "Carpeta",
 "From link" => "Des d'enllaÃ§",
-"Upload" => "Puja",
 "Cancel upload" => "CancelÂ·la la pujada",
 "Nothing in here. Upload something!" => "Res per aquÃ. Pugeu alguna cosa!",
 "Download" => "Baixa",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 65ac4b04931d7ccb5e79e21778dd017eb66b18dd..86b254ca8cb0024bddc15f0b25ee0a2745f79b8f 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -10,7 +10,7 @@
 "No file was uploaded" => "Å½Ã¡dnÃ½ soubor nebyl odeslÃ¡n",
 "Missing a temporary folder" => "ChybÃ adresÃ¡Å™ pro doÄasnÃ© soubory",
 "Failed to write to disk" => "ZÃ¡pis na disk selhal",
-"Not enough space available" => "Nedostatek dostupnÃ©ho mÃsta",
+"Not enough storage available" => "Nedostatek dostupnÃ©ho ÃºloÅ¾nÃ©ho prostoru",
 "Invalid directory." => "NeplatnÃ½ adresÃ¡Å™",
 "Files" => "Soubory",
 "Unshare" => "ZruÅ¡it sdÃlenÃ",
@@ -28,7 +28,9 @@
 "'.' is an invalid file name." => "'.' je neplatnÃ½m nÃ¡zvem souboru.",
 "File name cannot be empty." => "NÃ¡zev souboru nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ½ Å™etÄ›zec.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "NeplatnÃ½ nÃ¡zev, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
-"generating ZIP-file, it may take some time." => "generuji ZIP soubor, mÅ¯Å¾e to nÄ›jakou dobu trvat.",
+"Your storage is full, files can not be updated or synced anymore!" => "VaÅ¡e ÃºloÅ¾iÅ¡tÄ› je plnÃ©, nelze aktualizovat ani synchronizovat soubory.",
+"Your storage is almost full ({usedSpacePercent}%)" => "VaÅ¡e ÃºloÅ¾iÅ¡tÄ› je tÃ©mÄ›Å™ plnÃ© ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "VaÅ¡e soubory ke staÅ¾enÃ se pÅ™ipravujÃ. Pokud jsou velkÃ© mÅ¯Å¾e to chvÃli trvat.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat VÃ¡Å¡ soubor, protoÅ¾e je to adresÃ¡Å™ nebo mÃ¡ velikost 0 bajtÅ¯",
 "Upload Error" => "Chyba odesÃlÃ¡nÃ",
 "Close" => "ZavÅ™Ãt",
@@ -48,6 +50,7 @@
 "{count} folders" => "{count} sloÅ¾ky",
 "1 file" => "1 soubor",
 "{count} files" => "{count} soubory",
+"Upload" => "Odeslat",
 "File handling" => "ZachÃ¡zenÃ se soubory",
 "Maximum upload size" => "MaximÃ¡lnÃ velikost pro odesÃlÃ¡nÃ",
 "max. possible: " => "nejvÄ›tÅ¡Ã moÅ¾nÃ¡: ",
@@ -60,7 +63,6 @@
 "Text file" => "TextovÃ½ soubor",
 "Folder" => "SloÅ¾ka",
 "From link" => "Z odkazu",
-"Upload" => "Odeslat",
 "Cancel upload" => "ZruÅ¡it odesÃlÃ¡nÃ",
 "Nothing in here. Upload something!" => "Å½Ã¡dnÃ½ obsah. Nahrajte nÄ›co.",
 "Download" => "StÃ¡hnout",
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 02c177a2f1cc1775ed56e489c2429084532e4ca1..2f9ae8fbb8db094461bb79372bb3620c83f816bf 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
+"Could not move %s" => "Kunne ikke flytte %s",
+"Unable to rename file" => "Kunne ikke omdÃ¸be fil",
 "No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
 "There is no error, the file uploaded with success" => "Der er ingen fejl, filen blev uploadet med success",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
@@ -7,6 +10,8 @@
 "No file was uploaded" => "Ingen fil blev uploadet",
 "Missing a temporary folder" => "Mangler en midlertidig mappe",
 "Failed to write to disk" => "Fejl ved skrivning til disk.",
+"Not enough storage available" => "Der er ikke nok plads til rÃ¥dlighed",
+"Invalid directory." => "Ugyldig mappe.",
 "Files" => "Filer",
 "Unshare" => "Fjern deling",
 "Delete" => "Slet",
@@ -20,8 +25,12 @@
 "replaced {new_name} with {old_name}" => "erstattede {new_name} med {old_name}",
 "unshared {files}" => "ikke delte {files}",
 "deleted {files}" => "slettede {files}",
+"'.' is an invalid file name." => "'.' er et ugyldigt filnavn.",
+"File name cannot be empty." => "Filnavnet kan ikke stÃ¥ tomt.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
-"generating ZIP-file, it may take some time." => "genererer ZIP-fil, det kan tage lidt tid.",
+"Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres lÃ¦ngere!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er nÃ¦sten fyldt op ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Dit download forberedes. Dette kan tage lidt tid ved stÃ¸rre filer.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunne ikke uploade din fil, da det enten er en mappe eller er tom",
 "Upload Error" => "Fejl ved upload",
 "Close" => "Luk",
@@ -31,6 +40,7 @@
 "Upload cancelled." => "Upload afbrudt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kÃ¸rer. Hvis du forlader siden nu, vil uploadet blive annuleret.",
 "URL cannot be empty." => "URLen kan ikke vÃ¦re tom.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud",
 "{count} files scanned" => "{count} filer skannet",
 "error while scanning" => "fejl under scanning",
 "Name" => "Navn",
@@ -40,6 +50,7 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Upload" => "Upload",
 "File handling" => "FilhÃ¥ndtering",
 "Maximum upload size" => "Maksimal upload-stÃ¸rrelse",
 "max. possible: " => "max. mulige: ",
@@ -52,7 +63,6 @@
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
 "From link" => "Fra link",
-"Upload" => "Upload",
 "Cancel upload" => "Fortryd upload",
 "Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
 "Download" => "Download",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 089ce1c0a2635aad32e7394c47a4f3c399155c7c..db2476865fc7058aaafb2d442c56e3ecdba41249 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -10,7 +10,7 @@
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
 "Missing a temporary folder" => "TemporÃ¤rer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
-"Not enough space available" => "Nicht genug Speicherplatz verfÃ¼gbar",
+"Not enough storage available" => "Nicht genug Speicherplatz verfÃ¼gbar",
 "Invalid directory." => "UngÃ¼ltiges Verzeichnis",
 "Files" => "Dateien",
 "Unshare" => "Nicht mehr freigeben",
@@ -28,7 +28,9 @@
 "'.' 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.",
-"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicherplatz ist voll, Dateien kÃ¶nnen nicht mehr aktualisiert oder synchronisiert werden!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Dein Download wird vorbereitet. Dies kann bei grÃ¶ÃŸeren Dateien etwas dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groÃŸ ist.",
 "Upload Error" => "Fehler beim Upload",
 "Close" => "SchlieÃŸen",
@@ -48,6 +50,7 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
+"Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-GrÃ¶ÃŸe",
 "max. possible: " => "maximal mÃ¶glich:",
@@ -60,7 +63,6 @@
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
-"Upload" => "Hochladen",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
 "Download" => "Herunterladen",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index 5cd4ef70425b5a9606557d6f69662e41c4354673..72751a7fb6fd345c7de9d875789acf0dd78875b1 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -10,7 +10,7 @@
 "No file was uploaded" => "Es wurde keine Datei hochgeladen.",
 "Missing a temporary folder" => "Der temporÃ¤re Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
-"Not enough space available" => "Nicht genÃ¼gend Speicherplatz verfÃ¼gbar",
+"Not enough storage available" => "Nicht genug Speicher vorhanden.",
 "Invalid directory." => "UngÃ¼ltiges Verzeichnis.",
 "Files" => "Dateien",
 "Unshare" => "Nicht mehr freigeben",
@@ -28,7 +28,9 @@
 "'.' 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.",
-"generating ZIP-file, it may take some time." => "Erstelle ZIP-Datei. Dies kann eine Weile dauern.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ihr Speicher ist voll. Daher kÃ¶nnen keine Dateien mehr aktualisiert oder synchronisiert werden!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Ihr Download wird vorbereitet. Dies kann bei grÃ¶ÃŸeren Dateien einen Moment dauern.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groÃŸ ist.",
 "Upload Error" => "Fehler beim Upload",
 "Close" => "SchlieÃŸen",
@@ -48,6 +50,7 @@
 "{count} folders" => "{count} Ordner",
 "1 file" => "1 Datei",
 "{count} files" => "{count} Dateien",
+"Upload" => "Hochladen",
 "File handling" => "Dateibehandlung",
 "Maximum upload size" => "Maximale Upload-GrÃ¶ÃŸe",
 "max. possible: " => "maximal mÃ¶glich:",
@@ -60,7 +63,6 @@
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
 "From link" => "Von einem Link",
-"Upload" => "Hochladen",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
 "Download" => "Herunterladen",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 3c1ac538091440f70f839f9567db933048b4e9ed..196831b985dc47ef0ce580da33ee8ad81a69f14b 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.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,8 @@
 "No file was uploaded" => "ÎšÎ±Î½ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î¿ Î´ÎµÎ½ ÏƒÏ„Î¬Î»Î¸Î·ÎºÎµ",
 "Missing a temporary folder" => "Î›ÎµÎ¯Ï€ÎµÎ¹ Î¿ Ï€ÏÎ¿ÏƒÏ‰ÏÎ¹Î½ÏŒÏ‚ Ï†Î¬ÎºÎµÎ»Î¿Ï‚",
 "Failed to write to disk" => "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ ÏƒÏ„Î¿ Î´Î¯ÏƒÎºÎ¿",
+"Not enough storage available" => "ÎœÎ· ÎµÏ€Î±ÏÎºÎ®Ï‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ Ï‡ÏŽÏÎ¿Ï‚",
+"Invalid directory." => "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿Ï‚ Ï†Î¬ÎºÎµÎ»Î¿Ï‚.",
 "Files" => "Î‘ÏÏ‡ÎµÎ¯Î±",
 "Unshare" => "Î”Î¹Î±ÎºÎ¿Ï€Î® ÎºÎ¿Î¹Î½Î®Ï‚ Ï‡ÏÎ®ÏƒÎ·Ï‚",
 "Delete" => "Î”Î¹Î±Î³ÏÎ±Ï†Î®",
@@ -20,8 +25,12 @@
 "replaced {new_name} with {old_name}" => "Î±Î½Ï„Î¹ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ Ï„Î¿ {new_name} Î¼Îµ {old_name}",
 "unshared {files}" => "Î¼Î· Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÎÎ½Î± {files}",
 "deleted {files}" => "Î´Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î± {files}",
+"'.' is an invalid file name." => "'.' ÎµÎ¯Î½Î±Î¹ Î¼Î· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï….",
+"File name cannot be empty." => "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î´ÎµÎ½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î±, '\\', '/', '<', '>', ':', '\"', '|', '?' ÎºÎ±Î¹ '*' Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹.",
-"generating ZIP-file, it may take some time." => "Ï€Î±ÏÎ±Î³Ï‰Î³Î® Î±ÏÏ‡ÎµÎ¯Î¿Ï… ZIP, Î¯ÏƒÏ‰Ï‚ Î´Î¹Î±ÏÎºÎÏƒÎµÎ¹ Î±ÏÎºÎµÏ„Î¬.",
+"Your storage is full, files can not be updated or synced anymore!" => "ÎŸ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ ÏƒÎ±Ï‚ Ï‡ÏŽÏÎ¿Ï‚ ÎµÎ¯Î½Î±Î¹ Î³ÎµÎ¼Î¬Ï„Î¿Ï‚, Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± Î´ÎµÎ½ Î¼Ï€Î¿ÏÎ¿ÏÎ½ Î½Î± ÎµÎ½Î·Î¼ÎµÏÏ‰Î¸Î¿ÏÎ½ Î® Î½Î± ÏƒÏ…Î³Ï‡ÏÎ¿Î½Î¹ÏƒÏ„Î¿ÏÎ½ Ï€Î¹Î±!",
+"Your storage is almost full ({usedSpacePercent}%)" => "ÎŸ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ Ï‡ÏŽÏÎ¿Ï‚ ÎµÎ¯Î½Î±Î¹ ÏƒÏ‡ÎµÎ´ÏŒÎ½ Î³ÎµÎ¼Î¬Ï„Î¿Ï‚ ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Î— Î»Î®ÏˆÎ· Ï€ÏÎ¿ÎµÏ„Î¿Î¹Î¼Î¬Î¶ÎµÏ„Î±Î¹. Î‘Ï…Ï„ÏŒ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€Î¬ÏÎµÎ¹ ÏŽÏÎ± ÎµÎ¬Î½ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÎÏ‡Î¿Ï…Î½ Î¼ÎµÎ³Î¬Î»Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÏƒÏ„Î·Î½ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… ÏƒÎ±Ï‚ Î±Ï†Î¿Ï ÎµÎ¯Î½Î±Î¹ Ï†Î¬ÎºÎµÎ»Î¿Ï‚ Î® ÎÏ‡ÎµÎ¹ 0 bytes",
 "Upload Error" => "Î£Ï†Î¬Î»Î¼Î± Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚",
 "Close" => "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿",
@@ -31,6 +40,7 @@
 "Upload cancelled." => "Î— Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Î±ÎºÏ…ÏÏŽÎ¸Î·ÎºÎµ.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Î— Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î²ÏÎ¯ÏƒÎºÎµÏ„Î±Î¹ ÏƒÎµ ÎµÎ¾ÎÎ»Î¹Î¾Î·. Î¤Î¿ ÎºÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ Ï„Î·Ï‚ ÏƒÎµÎ»Î¯Î´Î±Ï‚ Î¸Î± Î±ÎºÏ…ÏÏŽÏƒÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®.",
 "URL cannot be empty." => "Î— URL Î´ÎµÎ½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï†Î±ÎºÎÎ»Î¿Ï…. Î— Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… 'ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿Ï‚' Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î±Ï€ÏŒ Î¿ Owncloud",
 "{count} files scanned" => "{count} Î±ÏÏ‡ÎµÎ¯Î± Î±Î½Î¹Ï‡Î½ÎµÏÏ„Î·ÎºÎ±Î½",
 "error while scanning" => "ÏƒÏ†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î±Î½Î¯Ï‡Î½ÎµÏ…ÏƒÎ·",
 "Name" => "ÎŒÎ½Î¿Î¼Î±",
@@ -40,6 +50,7 @@
 "{count} folders" => "{count} Ï†Î¬ÎºÎµÎ»Î¿Î¹",
 "1 file" => "1 Î±ÏÏ‡ÎµÎ¯Î¿",
 "{count} files" => "{count} Î±ÏÏ‡ÎµÎ¯Î±",
+"Upload" => "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®",
 "File handling" => "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î±ÏÏ‡ÎµÎ¯Ï‰Î½",
 "Maximum upload size" => "ÎœÎÎ³Î¹ÏƒÏ„Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚",
 "max. possible: " => "Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Î´Ï…Î½Î±Ï„ÏŒ:",
@@ -52,7 +63,6 @@
 "Text file" => "Î‘ÏÏ‡ÎµÎ¯Î¿ ÎºÎµÎ¹Î¼ÎÎ½Î¿Ï…",
 "Folder" => "Î¦Î¬ÎºÎµÎ»Î¿Ï‚",
 "From link" => "Î‘Ï€ÏŒ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿",
-"Upload" => "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®",
 "Cancel upload" => "Î‘ÎºÏÏÏ‰ÏƒÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚",
 "Nothing in here. Upload something!" => "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ. Î‘Î½ÎÎ²Î±ÏƒÎµ ÎºÎ¬Ï„Î¹!",
 "Download" => "Î›Î®ÏˆÎ·",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 92c03ee88269bb1d04afbfd2857c74376cfc5b0e..fc4367c55a36f18dcdc1e9d83d66a7b2a0e6aebc 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Ne eblis movi %s: dosiero kun Ä‰i tiu nomo jam ekzistas",
+"Could not move %s" => "Ne eblis movi %s",
+"Unable to rename file" => "Ne eblis alinomigi dosieron",
 "No file was uploaded. Unknown error" => "Neniu dosiero alÅutiÄis. Nekonata eraro.",
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alÅutiÄis sukcese",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alÅutita superas la regulon upload_max_filesize el php.ini: ",
@@ -7,6 +10,7 @@
 "No file was uploaded" => "Neniu dosiero estas alÅutita",
 "Missing a temporary folder" => "Mankas tempa dosierujo",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
+"Invalid directory." => "Nevalida dosierujo.",
 "Files" => "Dosieroj",
 "Unshare" => "Malkunhavigi",
 "Delete" => "Forigi",
@@ -20,8 +24,10 @@
 "replaced {new_name} with {old_name}" => "anstataÅiÄis {new_name} per {old_name}",
 "unshared {files}" => "malkunhaviÄis {files}",
 "deleted {files}" => "foriÄis {files}",
+"'.' 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.",
-"generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, Äi povas daÅri iom da tempo",
+"Your download is being prepared. This might take some time if the files are big." => "Via elÅuto pretiÄatas. Äˆi tio povas daÅri iom da tempo se la dosieroj grandas.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alÅuti vian dosieron Ä‰ar Äi estas dosierujo aÅ havas 0 duumokojn",
 "Upload Error" => "AlÅuta eraro",
 "Close" => "Fermi",
@@ -31,6 +37,7 @@
 "Upload cancelled." => "La alÅuto nuliÄis.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "DosieralÅuto plenumiÄas. Lasi la paÄon nun nuligus la alÅuton.",
 "URL cannot be empty." => "URL ne povas esti malplena.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nevalida dosierujnomo. Uzo de â€œSharedâ€ rezervatas de Owncloud.",
 "{count} files scanned" => "{count} dosieroj skaniÄis",
 "error while scanning" => "eraro dum skano",
 "Name" => "Nomo",
@@ -40,6 +47,7 @@
 "{count} folders" => "{count} dosierujoj",
 "1 file" => "1 dosiero",
 "{count} files" => "{count} dosierujoj",
+"Upload" => "AlÅuti",
 "File handling" => "Dosieradministro",
 "Maximum upload size" => "Maksimuma alÅutogrando",
 "max. possible: " => "maks. ebla: ",
@@ -52,7 +60,6 @@
 "Text file" => "Tekstodosiero",
 "Folder" => "Dosierujo",
 "From link" => "El ligilo",
-"Upload" => "AlÅuti",
 "Cancel upload" => "Nuligi alÅuton",
 "Nothing in here. Upload something!" => "Nenio estas Ä‰i tie. AlÅutu ion!",
 "Download" => "ElÅuti",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 885ed3770e925ddc1884f3c6fa43a7778e65a2b4..1620208559fa40097ed09f9d4fa9dcd1e58f363d 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -10,7 +10,6 @@
 "No file was uploaded" => "No se ha subido ningÃºn archivo",
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
-"Not enough space available" => "No hay suficiente espacio disponible",
 "Invalid directory." => "Directorio invalido.",
 "Files" => "Archivos",
 "Unshare" => "Dejar de compartir",
@@ -28,7 +27,7 @@
 "'.' 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.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no estÃ¡n permitidos ",
-"generating ZIP-file, it may take some time." => "generando un fichero ZIP, puede llevar un tiempo.",
+"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No ha sido posible subir tu archivo porque es un directorio o tiene 0 bytes",
 "Upload Error" => "Error al subir el archivo",
 "Close" => "cerrrar",
@@ -38,6 +37,7 @@
 "Upload cancelled." => "Subida cancelada.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo estÃ¡ en proceso. Salir de la pÃ¡gina ahora cancelarÃ¡ la subida.",
 "URL cannot be empty." => "La URL no puede estar vacÃa.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud",
 "{count} files scanned" => "{count} archivos escaneados",
 "error while scanning" => "error escaneando",
 "Name" => "Nombre",
@@ -47,6 +47,7 @@
 "{count} folders" => "{count} carpetas",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
+"Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "TamaÃ±o mÃ¡ximo de subida",
 "max. possible: " => "mÃ¡x. posible:",
@@ -59,7 +60,6 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde el enlace",
-"Upload" => "Subir",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "AquÃ no hay nada. Â¡Sube algo!",
 "Download" => "Descargar",
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
index 6863f701e65f456525696fa1e6ae6057e79c763e..cd8347a14ad8bf7f29b15fbe246ed25d8cd95781 100644
--- a/apps/files/l10n/es_AR.php
+++ b/apps/files/l10n/es_AR.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
+"Could not move %s" => "No se pudo mover %s ",
+"Unable to rename file" => "No fue posible cambiar el nombre al archivo",
 "No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
 "There is no error, the file uploaded with success" => "No se han producido errores, el archivo se ha subido con Ã©xito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentÃ¡s subir excede el tamaÃ±o definido por upload_max_filesize en el php.ini:",
@@ -7,7 +10,6 @@
 "No file was uploaded" => "El archivo no fue subido",
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "Error al escribir en el disco",
-"Not enough space available" => "No hay suficiente espacio disponible",
 "Invalid directory." => "Directorio invalido.",
 "Files" => "Archivos",
 "Unshare" => "Dejar de compartir",
@@ -22,8 +24,10 @@
 "replaced {new_name} with {old_name}" => "reemplazado {new_name} con {old_name}",
 "unshared {files}" => "{files} se dejaron de compartir",
 "deleted {files}" => "{files} borrados",
+"'.' is an invalid file name." => "'.' es un nombre de archivo invÃ¡lido.",
+"File name cannot be empty." => "El nombre del archivo no puede quedar vacÃo.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no estÃ¡n permitidos.",
-"generating ZIP-file, it may take some time." => "generando un archivo ZIP, puede llevar un tiempo.",
+"Your download is being prepared. This might take some time if the files are big." => "Tu descarga esta siendo preparada. Esto puede tardar algun tiempo si los archivos son muy grandes.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "No fue posible subir el archivo porque es un directorio o porque su tamaÃ±o es 0 bytes",
 "Upload Error" => "Error al subir el archivo",
 "Close" => "Cerrar",
@@ -33,6 +37,7 @@
 "Upload cancelled." => "La subida fue cancelada",
 "File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo estÃ¡ en proceso. Si salÃs de la pÃ¡gina ahora, la subida se cancelarÃ¡.",
 "URL cannot be empty." => "La URL no puede estar vacÃa",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nombre de carpeta invÃ¡lido. El uso de 'Shared' estÃ¡ reservado por ownCloud",
 "{count} files scanned" => "{count} archivos escaneados",
 "error while scanning" => "error mientras se escaneaba",
 "Name" => "Nombre",
@@ -42,6 +47,7 @@
 "{count} folders" => "{count} directorios",
 "1 file" => "1 archivo",
 "{count} files" => "{count} archivos",
+"Upload" => "Subir",
 "File handling" => "Tratamiento de archivos",
 "Maximum upload size" => "TamaÃ±o mÃ¡ximo de subida",
 "max. possible: " => "mÃ¡x. posible:",
@@ -54,7 +60,6 @@
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
 "From link" => "Desde enlace",
-"Upload" => "Subir",
 "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 6996b0a7918a97fd0779f12485c19448904374e0..1df237baa82edda988ee864235c6bc6576328700 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -20,7 +20,6 @@
 "unshared {files}" => "jagamata {files}",
 "deleted {files}" => "kustutatud {files}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
-"generating ZIP-file, it may take some time." => "ZIP-faili loomine, see vÃµib veidi aega vÃµtta.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Sinu faili Ã¼leslaadimine ebaÃµnnestus, kuna see on kaust vÃµi selle suurus on 0 baiti",
 "Upload Error" => "Ãœleslaadimise viga",
 "Close" => "Sulge",
@@ -39,6 +38,7 @@
 "{count} folders" => "{count} kausta",
 "1 file" => "1 fail",
 "{count} files" => "{count} faili",
+"Upload" => "Lae Ã¼les",
 "File handling" => "Failide kÃ¤sitlemine",
 "Maximum upload size" => "Maksimaalne Ã¼leslaadimise suurus",
 "max. possible: " => "maks. vÃµimalik: ",
@@ -51,7 +51,6 @@
 "Text file" => "Tekstifail",
 "Folder" => "Kaust",
 "From link" => "Allikast",
-"Upload" => "Lae Ã¼les",
 "Cancel upload" => "TÃ¼hista Ã¼leslaadimine",
 "Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi Ã¼les!",
 "Download" => "Lae alla",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 96f59a668e99f1bed345b091c9ec95bb825dd9b3..8b8f6d2bd17ae1515aa33f4bfba583f8438a04de 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
+"Could not move %s" => "Ezin dira fitxategiak mugitu %s",
+"Unable to rename file" => "Ezin izan da fitxategia berrizendatu",
 "No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
 "There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
@@ -7,6 +10,8 @@
 "No file was uploaded" => "Ez da fitxategirik igo",
 "Missing a temporary folder" => "Aldi baterako karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
+"Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
+"Invalid directory." => "Baliogabeko karpeta.",
 "Files" => "Fitxategiak",
 "Unshare" => "Ez elkarbanatu",
 "Delete" => "Ezabatu",
@@ -20,8 +25,12 @@
 "replaced {new_name} with {old_name}" => " {new_name}-k {old_name} ordezkatu du",
 "unshared {files}" => "elkarbanaketa utzita {files}",
 "deleted {files}" => "ezabatuta {files}",
+"'.' is an invalid file name." => "'.' ez da fitxategi izen baliogarria.",
+"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
-"generating ZIP-file, it may take some time." => "ZIP-fitxategia sortzen ari da, denbora har dezake",
+"Your storage is full, files can not be updated or synced anymore!" => "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})",
+"Your download is being prepared. This might take some time if the files are big." => "Zure deskarga prestatu egin behar da. Denbora bat har lezake fitxategiak handiak badira. ",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu",
 "Upload Error" => "Igotzean errore bat suertatu da",
 "Close" => "Itxi",
@@ -31,6 +40,7 @@
 "Upload cancelled." => "Igoera ezeztatuta",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
 "URL cannot be empty." => "URLa ezin da hutsik egon.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du",
 "{count} files scanned" => "{count} fitxategi eskaneatuta",
 "error while scanning" => "errore bat egon da eskaneatzen zen bitartean",
 "Name" => "Izena",
@@ -40,6 +50,7 @@
 "{count} folders" => "{count} karpeta",
 "1 file" => "fitxategi bat",
 "{count} files" => "{count} fitxategi",
+"Upload" => "Igo",
 "File handling" => "Fitxategien kudeaketa",
 "Maximum upload size" => "Igo daitekeen gehienezko tamaina",
 "max. possible: " => "max, posiblea:",
@@ -52,7 +63,6 @@
 "Text file" => "Testu fitxategia",
 "Folder" => "Karpeta",
 "From link" => "Estekatik",
-"Upload" => "Igo",
 "Cancel upload" => "Ezeztatu igoera",
 "Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
 "Download" => "Deskargatu",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 062df6a56b3f64796ea481ca0726d5adad23fe2e..3d3bfad1f9bcf8fa4edc52630ce962c69b0155e5 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -1,26 +1,53 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "%s Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ ØØ±Ú©Øª Ú©Ù†Ø¯ - Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¨Ø§ Ø§ÛŒÙ† Ù†Ø§Ù… ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯. ",
+"Could not move %s" => "%s Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ ØØ±Ú©Øª Ú©Ù†Ø¯ ",
+"Unable to rename file" => "Ù‚Ø§Ø¯Ø± Ø¨Ù‡ ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù†ÛŒØ³Øª.",
 "No file was uploaded. Unknown error" => "Ù‡ÛŒÚ† ÙØ§ÛŒÙ„ÛŒ Ø¢Ù¾Ù„ÙˆØ¯ Ù†Ø´Ø¯.Ø®Ø·Ø§ÛŒ Ù†Ø§Ø´Ù†Ø§Ø³",
 "There is no error, the file uploaded with success" => "Ù‡ÛŒÚ† Ø®Ø·Ø§ÛŒÛŒ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯ ÙØ§ÛŒÙ„ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¢Ù¾Ù„ÙˆØ¯ Ø´Ø¯Ù‡ Ø¨ÛŒØ´ Ø§Ø²Ø¯Ø³ØªÙˆØ±  Ù…Ø§Ú©Ø²ÛŒÙ…Ù…_ØØ¬Ù… ÙØ§ÛŒÙ„_Ø¨Ø±Ø§ÛŒ Ø¢Ù¾Ù„ÙˆØ¯ Ø¯Ø±   php.ini Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª.",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ØØ¯Ø§Ú©Ø«Ø± ØØ¬Ù… Ù…Ø¬Ø§Ø² Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø§Ø² Ø·Ø±ÛŒÙ‚ HTML \nMAX_FILE_SIZE",
 "The uploaded file was only partially uploaded" => "Ù…Ù‚Ø¯Ø§Ø± Ú©Ù…ÛŒ Ø§Ø² ÙØ§ÛŒÙ„ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡",
 "No file was uploaded" => "Ù‡ÛŒÚ† ÙØ§ÛŒÙ„ÛŒ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù†Ø´Ø¯Ù‡",
 "Missing a temporary folder" => "ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ù…ÙˆÙ‚Øª Ú¯Ù… Ø´Ø¯Ù‡ Ø§Ø³Øª",
 "Failed to write to disk" => "Ù†ÙˆØ´ØªÙ† Ø¨Ø± Ø±ÙˆÛŒ Ø¯ÛŒØ³Ú© Ø³Ø®Øª Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯",
+"Invalid directory." => "ÙÙ‡Ø±Ø³Øª Ø±Ø§Ù‡Ù†Ù…Ø§ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ù…ÛŒ Ø¨Ø§Ø´Ø¯.",
 "Files" => "ÙØ§ÛŒÙ„ Ù‡Ø§",
+"Unshare" => "Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©",
 "Delete" => "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†",
 "Rename" => "ØªØºÛŒÛŒØ±Ù†Ø§Ù…",
+"{new_name} already exists" => "{Ù†Ø§Ù… _Ø¬Ø¯ÛŒØ¯} Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯.",
 "replace" => "Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ†",
+"suggest name" => "Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù†Ø§Ù…",
 "cancel" => "Ù„ØºÙˆ",
+"replaced {new_name}" => "{Ù†Ø§Ù… _Ø¬Ø¯ÛŒØ¯} Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø´Ø¯ ",
 "undo" => "Ø¨Ø§Ø²Ú¯Ø´Øª",
-"generating ZIP-file, it may take some time." => "Ø¯Ø± ØØ§Ù„ Ø³Ø§Ø®Øª ÙØ§ÛŒÙ„ ÙØ´Ø±Ø¯Ù‡ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ø²Ù…Ø§Ù† Ø²ÛŒØ§Ø¯ÛŒ Ø¨Ù‡ Ø·ÙˆÙ„ Ø¨ÛŒØ§Ù†Ø¬Ø§Ù…Ø¯",
+"replaced {new_name} with {old_name}" => "{Ù†Ø§Ù…_Ø¬Ø¯ÛŒØ¯} Ø¨Ø§ { Ù†Ø§Ù…_Ù‚Ø¯ÛŒÙ…ÛŒ} Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø´Ø¯.",
+"unshared {files}" => "{ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ } Ù‚Ø³Ù…Øª Ù†Ø´Ø¯Ù‡",
+"deleted {files}" => "{ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ } Ù¾Ø§Ú© Ø´Ø¯Ù‡",
+"'.' is an invalid file name." => "'.'   ÛŒÚ© Ù†Ø§Ù… Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª.",
+"File name cannot be empty." => "Ù†Ø§Ù… Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯.",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ù†Ø§Ù… Ù†Ø§Ù…Ø¹ØªØ¨Ø± ØŒ  '\\', '/', '<', '>', ':', '\"', '|', '?'  Ùˆ '*'  Ù…Ø¬Ø§Ø² Ù†Ù…ÛŒ Ø¨Ø§Ø´Ù†Ø¯.",
+"Your download is being prepared. This might take some time if the files are big." => "Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø¢Ù…Ø§Ø¯Ù‡ Ø´Ø¯Ù† Ø§Ø³Øª. Ø¯Ø± ØµÙˆØ±ØªÛŒÚ©Ù‡ Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§ Ø¨Ø²Ø±Ú¯ Ø¨Ø§Ø´Ù†Ø¯ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù…Ø¯ØªÛŒ Ø·ÙˆÙ„ Ø¨Ú©Ø´Ø¯.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ù†Ø§ØªÙˆØ§Ù† Ø¯Ø± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ÛŒØ§ ÙØ§ÛŒÙ„ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø§Ø³Øª ÛŒØ§ 0Ø¨Ø§ÛŒØª Ø¯Ø§Ø±Ø¯",
 "Upload Error" => "Ø®Ø·Ø§ Ø¯Ø± Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ",
 "Close" => "Ø¨Ø³ØªÙ†",
 "Pending" => "Ø¯Ø± Ø§Ù†ØªØ¸Ø§Ø±",
+"1 file uploading" => "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¢Ù¾Ù„ÙˆØ¯ Ø´Ø¯.",
+"{count} files uploading" => "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø¯Ø± ØØ§Ù„ Ø¢Ù¾Ù„ÙˆØ¯",
 "Upload cancelled." => "Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ Ù„ØºÙˆ Ø´Ø¯",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Ø¢Ù¾Ù„ÙˆØ¯Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¯Ø± ØØ§Ù„ Ù¾ÛŒØ´Ø±ÙØª Ø§Ø³Øª. Ø¯Ø± ØµÙˆØ±Øª Ø®Ø±ÙˆØ¬ Ø§Ø² ØµÙØÙ‡ Ø¢Ù¾Ù„ÙˆØ¯ Ù„ØºÙˆ Ù…ÛŒÚ¯Ø±Ø¯Ø¯. ",
+"URL cannot be empty." => "URL  Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª. Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² \" Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ \" Ù…ØªØ¹Ù„Ù‚ Ø¨Ù‡ Ø³Ø§ÛŒØª Owncloud Ø§Ø³Øª.",
+"{count} files scanned" => "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø§Ø³Ú©Ù† Ø´Ø¯Ù‡",
+"error while scanning" => "Ø®Ø·Ø§ Ø¯Ø± ØØ§Ù„ Ø§Ù†Ø¬Ø§Ù… Ø§Ø³Ú©Ù† ",
 "Name" => "Ù†Ø§Ù…",
 "Size" => "Ø§Ù†Ø¯Ø§Ø²Ù‡",
 "Modified" => "ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡",
+"1 folder" => "1 Ù¾ÙˆØ´Ù‡",
+"{count} folders" => "{ Ø´Ù…Ø§Ø±} Ù¾ÙˆØ´Ù‡ Ù‡Ø§",
+"1 file" => "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡",
+"{count} files" => "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§",
+"Upload" => "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ",
 "File handling" => "Ø§Ø¯Ø§Ø±Ù‡ Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§",
 "Maximum upload size" => "ØØ¯Ø§Ú©Ø«Ø± Ø§Ù†Ø¯Ø§Ø²Ù‡ Ø¨Ø§Ø±Ú¯Ø²Ø§Ø±ÛŒ",
 "max. possible: " => "ØØ¯Ø§Ú©Ø«Ø±Ù…Ù‚Ø¯Ø§Ø±Ù…Ù…Ú©Ù†:",
@@ -32,7 +59,7 @@
 "New" => "Ø¬Ø¯ÛŒØ¯",
 "Text file" => "ÙØ§ÛŒÙ„ Ù…ØªÙ†ÛŒ",
 "Folder" => "Ù¾ÙˆØ´Ù‡",
-"Upload" => "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ",
+"From link" => "Ø§Ø² Ù¾ÛŒÙˆÙ†Ø¯",
 "Cancel upload" => "Ù…ØªÙˆÙ‚Ù Ú©Ø±Ø¯Ù† Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ",
 "Nothing in here. Upload something!" => "Ø§ÛŒÙ†Ø¬Ø§ Ù‡ÛŒÚ† Ú†ÛŒØ² Ù†ÛŒØ³Øª.",
 "Download" => "Ø¨Ø§Ø±Ú¯ÛŒØ±ÛŒ",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index e7e4b044372ce00ad90b6c547943fa48f1e60997..999bd7884d31581638d00696167083631c0d08bb 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -9,7 +9,7 @@
 "No file was uploaded" => "YhtÃ¤kÃ¤Ã¤n tiedostoa ei lÃ¤hetetty",
 "Missing a temporary folder" => "VÃ¤liaikaiskansiota ei ole olemassa",
 "Failed to write to disk" => "Levylle kirjoitus epÃ¤onnistui",
-"Not enough space available" => "Tilaa ei ole riittÃ¤vÃ¤sti",
+"Not enough storage available" => "Tallennustilaa ei ole riittÃ¤vÃ¤sti kÃ¤ytettÃ¤vissÃ¤",
 "Invalid directory." => "Virheellinen kansio.",
 "Files" => "Tiedostot",
 "Unshare" => "Peru jakaminen",
@@ -23,7 +23,9 @@
 "'.' is an invalid file name." => "'.' on virheellinen nimi tiedostolle.",
 "File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjÃ¤.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivÃ¤t ole sallittuja.",
-"generating ZIP-file, it may take some time." => "luodaan ZIP-tiedostoa, tÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken.",
+"Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enÃ¤Ã¤ pÃ¤ivittÃ¤Ã¤ tai synkronoida!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Lataustasi valmistellaan. TÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken, jos tiedostot ovat suuria kooltaan.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tiedoston lÃ¤hetys epÃ¤onnistui, koska sen koko on 0 tavua tai kyseessÃ¤ on kansio",
 "Upload Error" => "LÃ¤hetysvirhe.",
 "Close" => "Sulje",
@@ -38,6 +40,7 @@
 "{count} folders" => "{count} kansiota",
 "1 file" => "1 tiedosto",
 "{count} files" => "{count} tiedostoa",
+"Upload" => "LÃ¤hetÃ¤",
 "File handling" => "Tiedostonhallinta",
 "Maximum upload size" => "LÃ¤hetettÃ¤vÃ¤n tiedoston suurin sallittu koko",
 "max. possible: " => "suurin mahdollinen:",
@@ -50,7 +53,6 @@
 "Text file" => "Tekstitiedosto",
 "Folder" => "Kansio",
 "From link" => "LinkistÃ¤",
-"Upload" => "LÃ¤hetÃ¤",
 "Cancel upload" => "Peru lÃ¤hetys",
 "Nothing in here. Upload something!" => "TÃ¤Ã¤llÃ¤ ei ole mitÃ¤Ã¤n. LÃ¤hetÃ¤ tÃ¤nne jotakin!",
 "Download" => "Lataa",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index f14759ff8f028a6c826cde5047c5d2ded93e906a..ce8ef959d0ad209bc52193b2096ee94f563dec62 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -10,7 +10,7 @@
 "No file was uploaded" => "Aucun fichier n'a Ã©tÃ© tÃ©lÃ©versÃ©",
 "Missing a temporary folder" => "Il manque un rÃ©pertoire temporaire",
 "Failed to write to disk" => "Erreur d'Ã©criture sur le disque",
-"Not enough space available" => "Espace disponible insuffisant",
+"Not enough storage available" => "Plus assez d'espace de stockage disponible",
 "Invalid directory." => "Dossier invalide.",
 "Files" => "Fichiers",
 "Unshare" => "Ne plus partager",
@@ -28,7 +28,9 @@
 "'.' is an invalid file name." => "'.' n'est pas un nom de fichier valide.",
 "File name cannot be empty." => "Le nom de fichier ne peut Ãªtre vide.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractÃ¨res '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisÃ©s.",
-"generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ;  cela peut prendre du temps.",
+"Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus Ãªtre tÃ©lÃ©versÃ©s ou synchronisÃ©s !",
+"Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Votre tÃ©lÃ©chargement est cours de prÃ©paration. Ceci peut nÃ©cessiter un certain temps si les fichiers sont volumineux.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fichier fait 0 octet.",
 "Upload Error" => "Erreur de chargement",
 "Close" => "Fermer",
@@ -48,6 +50,7 @@
 "{count} folders" => "{count} dossiers",
 "1 file" => "1 fichier",
 "{count} files" => "{count} fichiers",
+"Upload" => "Envoyer",
 "File handling" => "Gestion des fichiers",
 "Maximum upload size" => "Taille max. d'envoi",
 "max. possible: " => "Max. possible :",
@@ -60,7 +63,6 @@
 "Text file" => "Fichier texte",
 "Folder" => "Dossier",
 "From link" => "Depuis le lien",
-"Upload" => "Envoyer",
 "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 c15066163cf5636a113f697a019415770d37b8ca..3bac12b351e748a2ad8cb382d86e4830fcc5d387 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -10,7 +10,6 @@
 "No file was uploaded" => "Non se enviou ningÃºn ficheiro",
 "Missing a temporary folder" => "Falta un cartafol temporal",
 "Failed to write to disk" => "Erro ao escribir no disco",
-"Not enough space available" => "O espazo dispoÃ±Ãbel Ã© insuficiente",
 "Invalid directory." => "O directorio Ã© incorrecto.",
 "Files" => "Ficheiros",
 "Unshare" => "Deixar de compartir",
@@ -28,7 +27,6 @@
 "'.' is an invalid file name." => "'.' Ã© un nonme de ficheiro non vÃ¡lido",
 "File name cannot be empty." => "O nome de ficheiro non pode estar baldeiro",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non vÃ¡lido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non se permiten.",
-"generating ZIP-file, it may take some time." => "xerando un ficheiro ZIP, o que pode levar un anaco.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou Ã© un directorio ou ten 0 bytes",
 "Upload Error" => "Erro na subida",
 "Close" => "Pechar",
@@ -48,6 +46,7 @@
 "{count} folders" => "{count} cartafoles",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
+"Upload" => "Enviar",
 "File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "TamaÃ±o mÃ¡ximo de envÃo",
 "max. possible: " => "mÃ¡x. posible: ",
@@ -60,7 +59,6 @@
 "Text file" => "Ficheiro de texto",
 "Folder" => "Cartafol",
 "From link" => "Dende a ligazÃ³n",
-"Upload" => "Enviar",
 "Cancel upload" => "Cancelar a subida",
 "Nothing in here. Upload something!" => "Nada por aquÃ. EnvÃa algo.",
 "Download" => "Descargar",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index bac9a8a6a532cc2608a7c0cd85c8e171239f8568..62b397e129eb3ddd2c5a1fc3e7e9704776a9dad2 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -21,7 +21,6 @@
 "unshared {files}" => "×‘×•×˜×œ ×©×™×ª×•×¤× ×©×œ {files}",
 "deleted {files}" => "{files} × ×ž×—×§×•",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "×”×©× ×©×’×•×™, ××¡×•×¨ ×œ×”×©×ª×ž×© ×‘×ª×•×•×™× '\\', '/', '<', '>', ':', '\"', '|', '?' ×•Ö¾'*'.",
-"generating ZIP-file, it may take some time." => "×™×•×¦×¨ ×§×•×‘×¥ ZIP, ×× × ×”×ž×ª×Ÿ.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "×œ× ×™×›×•×œ ×œ×”×¢×œ×•×ª ××ª ×”×§×•×‘×¥ ×ž×›×™×•×•×Ÿ ×©×–×• ×ª×§×™×” ××• ×©×ž×©×§×œ ×”×§×•×‘×¥ 0 ×‘×ª×™×",
 "Upload Error" => "×©×’×™××ª ×”×¢×œ××”",
 "Close" => "×¡×’×™×¨×”",
@@ -40,6 +39,7 @@
 "{count} folders" => "{count} ×ª×™×§×™×•×ª",
 "1 file" => "×§×•×‘×¥ ××—×“",
 "{count} files" => "{count} ×§×‘×¦×™×",
+"Upload" => "×”×¢×œ××”",
 "File handling" => "×˜×™×¤×•×œ ×‘×§×‘×¦×™×",
 "Maximum upload size" => "×’×•×“×œ ×”×¢×œ××” ×ž×§×¡×™×ž×œ×™",
 "max. possible: " => "×”×ž×¨×‘×™ ×”××¤×©×¨×™: ",
@@ -52,7 +52,6 @@
 "Text file" => "×§×•×‘×¥ ×˜×§×¡×˜",
 "Folder" => "×ª×™×§×™×™×”",
 "From link" => "×ž×§×™×©×•×¨",
-"Upload" => "×”×¢×œ××”",
 "Cancel upload" => "×‘×™×˜×•×œ ×”×”×¢×œ××”",
 "Nothing in here. Upload something!" => "××™×Ÿ ×›××Ÿ ×©×•× ×“×‘×¨. ××•×œ×™ ×‘×¨×¦×•× ×š ×œ×”×¢×œ×•×ª ×ž×©×”×•?",
 "Download" => "×”×•×¨×“×”",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 4db4ac3f3e3c0a6ffa61efbd4a39657ba9d79b49..7000caf0d170b00e5896ad5ee845bc1a1bd26737 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -13,7 +13,6 @@
 "suggest name" => "predloÅ¾i ime",
 "cancel" => "odustani",
 "undo" => "vrati",
-"generating ZIP-file, it may take some time." => "generiranje ZIP datoteke, ovo moÅ¾e potrajati.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "NemoguÄ‡e poslati datoteku jer je prazna ili je direktorij",
 "Upload Error" => "PogreÅ¡ka pri slanju",
 "Close" => "Zatvori",
@@ -25,6 +24,7 @@
 "Name" => "Naziv",
 "Size" => "VeliÄina",
 "Modified" => "Zadnja promjena",
+"Upload" => "PoÅ¡alji",
 "File handling" => "datoteka za rukovanje",
 "Maximum upload size" => "Maksimalna veliÄina prijenosa",
 "max. possible: " => "maksimalna moguÄ‡a: ",
@@ -36,7 +36,6 @@
 "New" => "novo",
 "Text file" => "tekstualna datoteka",
 "Folder" => "mapa",
-"Upload" => "PoÅ¡alji",
 "Cancel upload" => "Prekini upload",
 "Nothing in here. Upload something!" => "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!",
 "Download" => "Preuzmi",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index b0d46ee7a2cd01114a1402b77a0f3709dad5a592..be3dd1b9c3c9b83e22f29777cfd8e77795efb787 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "%s Ã¡thelyezÃ©se nem sikerÃ¼lt - mÃ¡r lÃ©tezik mÃ¡sik fÃ¡jl ezzel a nÃ©vvel",
+"Could not move %s" => "Nem sikerÃ¼lt %s Ã¡thelyezÃ©se",
+"Unable to rename file" => "Nem lehet Ã¡tnevezni a fÃ¡jlt",
 "No file was uploaded. Unknown error" => "Nem tÃ¶rtÃ©nt feltÃ¶ltÃ©s. Ismeretlen hiba",
 "There is no error, the file uploaded with success" => "A fÃ¡jlt sikerÃ¼lt feltÃ¶lteni",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltÃ¶ltÃ¶tt fÃ¡jl mÃ©rete meghaladja a php.ini Ã¡llomÃ¡nyban megadott upload_max_filesize paramÃ©ter Ã©rtÃ©kÃ©t.",
@@ -7,7 +10,7 @@
 "No file was uploaded" => "Nem tÃ¶ltÅ‘dÃ¶tt fel semmi",
 "Missing a temporary folder" => "HiÃ¡nyzik egy ideiglenes mappa",
 "Failed to write to disk" => "Nem sikerÃ¼lt a lemezre tÃ¶rtÃ©nÅ‘ ÃrÃ¡s",
-"Not enough space available" => "Nincs elÃ©g szabad hely",
+"Not enough storage available" => "Nincs elÃ©g szabad hely.",
 "Invalid directory." => "Ã‰rvÃ©nytelen mappa.",
 "Files" => "FÃ¡jlok",
 "Unshare" => "MegosztÃ¡s visszavonÃ¡sa",
@@ -25,7 +28,9 @@
 "'.' is an invalid file name." => "'.' fÃ¡jlnÃ©v Ã©rvÃ©nytelen.",
 "File name cannot be empty." => "A fÃ¡jlnÃ©v nem lehet semmi.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ã‰rvÃ©nytelen elnevezÃ©s. Ezek a karakterek nem hasznÃ¡lhatÃ³k: '\\', '/', '<', '>', ':', '\"', '|', '?' Ã©s '*'",
-"generating ZIP-file, it may take some time." => "ZIP-fÃ¡jl generÃ¡lÃ¡sa, ez eltarthat egy ideig.",
+"Your storage is full, files can not be updated or synced anymore!" => "A tÃ¡rolÃ³ tele van, a fÃ¡jlok nem frissÃthetÅ‘ek vagy szinkronizÃ¡lhatÃ³ak a jÃ¶vÅ‘ben.",
+"Your storage is almost full ({usedSpacePercent}%)" => "A tÃ¡rolÃ³ majdnem tele van ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "KÃ©szÃ¼l a letÃ¶ltendÅ‘ Ã¡llomÃ¡ny. Ez eltarthat egy ideig, ha nagyok a fÃ¡jlok.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nem tÃ¶lthetÅ‘ fel, mert mappa volt, vagy 0 byte mÃ©retÅ±",
 "Upload Error" => "FeltÃ¶ltÃ©si hiba",
 "Close" => "BezÃ¡rÃ¡s",
@@ -35,6 +40,7 @@
 "Upload cancelled." => "A feltÃ¶ltÃ©st megszakÃtottuk.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "FÃ¡jlfeltÃ¶ltÃ©s van folyamatban. Az oldal elhagyÃ¡sa megszakÃtja a feltÃ¶ltÃ©st.",
 "URL cannot be empty." => "Az URL nem lehet semmi.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ã‰rvÃ©nytelen mappanÃ©v. A nÃ©v hasznÃ¡lata csak a Owncloud szÃ¡mÃ¡ra lehetsÃ©ges.",
 "{count} files scanned" => "{count} fÃ¡jlt talÃ¡ltunk",
 "error while scanning" => "Hiba a fÃ¡jllista-ellenÅ‘rzÃ©s sorÃ¡n",
 "Name" => "NÃ©v",
@@ -44,6 +50,7 @@
 "{count} folders" => "{count} mappa",
 "1 file" => "1 fÃ¡jl",
 "{count} files" => "{count} fÃ¡jl",
+"Upload" => "FeltÃ¶ltÃ©s",
 "File handling" => "FÃ¡jlkezelÃ©s",
 "Maximum upload size" => "MaximÃ¡lis feltÃ¶lthetÅ‘ fÃ¡jlmÃ©ret",
 "max. possible: " => "max. lehetsÃ©ges: ",
@@ -56,7 +63,6 @@
 "Text file" => "SzÃ¶vegfÃ¡jl",
 "Folder" => "Mappa",
 "From link" => "FeltÃ¶ltÃ©s linkrÅ‘l",
-"Upload" => "FeltÃ¶ltÃ©s",
 "Cancel upload" => "A feltÃ¶ltÃ©s megszakÃtÃ¡sa",
 "Nothing in here. Upload something!" => "Itt nincs semmi. TÃ¶ltsÃ¶n fel valamit!",
 "Download" => "LetÃ¶ltÃ©s",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index ada64cd7574ac43a4485a1bbdfaa5db0085173b6..ae614c1bf5dadfa661d90da8ee0f64f4ae35df75 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -8,12 +8,12 @@
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
+"Upload" => "Incargar",
 "Maximum upload size" => "Dimension maxime de incargamento",
 "Save" => "Salveguardar",
 "New" => "Nove",
 "Text file" => "File de texto",
 "Folder" => "Dossier",
-"Upload" => "Incargar",
 "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
 "Download" => "Discargar",
 "Upload too large" => "Incargamento troppo longe"
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 5d934e97e7bce1d0e723ad54ba652dce7a1ab64a..3ebb9983291dd1dd51920f59a3f851324421a0b9 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -11,7 +11,6 @@
 "replace" => "mengganti",
 "cancel" => "batalkan",
 "undo" => "batal dikerjakan",
-"generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
 "Upload Error" => "Terjadi Galat Pengunggahan",
 "Close" => "tutup",
@@ -21,6 +20,7 @@
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
+"Upload" => "Unggah",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran unggah maksimum",
 "max. possible: " => "Kemungkinan maks:",
@@ -32,7 +32,6 @@
 "New" => "Baru",
 "Text file" => "Berkas teks",
 "Folder" => "Folder",
-"Upload" => "Unggah",
 "Cancel upload" => "Batal mengunggah",
 "Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
 "Download" => "Unduh",
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
index 2eff686611ab21b3fb88a9e80e7750909b4d98a7..297853c81610e47e704344721d7c7b3522c11c16 100644
--- a/apps/files/l10n/is.php
+++ b/apps/files/l10n/is.php
@@ -10,7 +10,6 @@
 "No file was uploaded" => "Engin skrÃ¡ skilaÃ°i sÃ©r",
 "Missing a temporary folder" => "Vantar brÃ¡Ã°abirgÃ°amÃ¶ppu",
 "Failed to write to disk" => "TÃ³kst ekki aÃ° skrifa Ã¡ disk",
-"Not enough space available" => "Ekki nÃ¦gt plÃ¡ss tiltÃ¦kt",
 "Invalid directory." => "Ã“gild mappa.",
 "Files" => "SkrÃ¡r",
 "Unshare" => "HÃ¦tta deilingu",
@@ -28,7 +27,6 @@
 "'.' 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Ã°.",
-"generating ZIP-file, it may take some time." => "bÃ½ til ZIP skrÃ¡, Ã¾aÃ° gÃ¦ti tekiÃ° smÃ¡ stund.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Innsending Ã¡ skrÃ¡ mistÃ³kst, hugsanlega sendir Ã¾Ãº mÃ¶ppu eÃ°a skrÃ¡in er 0 bÃ¦ti.",
 "Upload Error" => "Villa viÃ° innsendingu",
 "Close" => "Loka",
@@ -48,6 +46,7 @@
 "{count} folders" => "{count} mÃ¶ppur",
 "1 file" => "1 skrÃ¡",
 "{count} files" => "{count} skrÃ¡r",
+"Upload" => "Senda inn",
 "File handling" => "MeÃ°hÃ¶ndlun skrÃ¡r",
 "Maximum upload size" => "HÃ¡marks stÃ¦rÃ° innsendingar",
 "max. possible: " => "hÃ¡mark mÃ¶gulegt: ",
@@ -60,7 +59,6 @@
 "Text file" => "Texta skrÃ¡",
 "Folder" => "Mappa",
 "From link" => "Af tengli",
-"Upload" => "Senda inn",
 "Cancel upload" => "HÃ¦tta viÃ° innsendingu",
 "Nothing in here. Upload something!" => "Ekkert hÃ©r. Settu eitthvaÃ° inn!",
 "Download" => "NiÃ°urhal",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index a54e424694f7d93aa7959389071cd996862dfee2..63bc71d672985c2ec66382e01ab32a979ee2942d 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -10,7 +10,7 @@
 "No file was uploaded" => "Nessun file Ã¨ stato caricato",
 "Missing a temporary folder" => "Cartella temporanea mancante",
 "Failed to write to disk" => "Scrittura su disco non riuscita",
-"Not enough space available" => "Spazio disponibile insufficiente",
+"Not enough storage available" => "Spazio di archiviazione insufficiente",
 "Invalid directory." => "Cartella non valida.",
 "Files" => "File",
 "Unshare" => "Rimuovi condivisione",
@@ -28,7 +28,9 @@
 "'.' is an invalid file name." => "'.' non Ã¨ un nome file valido.",
 "File name cannot be empty." => "Il nome del file non puÃ² essere vuoto.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
-"generating ZIP-file, it may take some time." => "creazione file ZIP, potrebbe richiedere del tempo.",
+"Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione Ã¨ pieno, i file non possono essere piÃ¹ aggiornati o sincronizzati!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione Ã¨ quasi pieno ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Il tuo scaricamento Ã¨ in fase di preparazione. CiÃ² potrebbe richiedere del tempo se i file sono grandi.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossibile inviare il file poichÃ© Ã¨ una cartella o ha dimensione 0 byte",
 "Upload Error" => "Errore di invio",
 "Close" => "Chiudi",
@@ -48,6 +50,7 @@
 "{count} folders" => "{count} cartelle",
 "1 file" => "1 file",
 "{count} files" => "{count} file",
+"Upload" => "Carica",
 "File handling" => "Gestione file",
 "Maximum upload size" => "Dimensione massima upload",
 "max. possible: " => "numero mass.: ",
@@ -60,7 +63,6 @@
 "Text file" => "File di testo",
 "Folder" => "Cartella",
 "From link" => "Da collegamento",
-"Upload" => "Carica",
 "Cancel upload" => "Annulla invio",
 "Nothing in here. Upload something!" => "Non c'Ã¨ niente qui. Carica qualcosa!",
 "Download" => "Scarica",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 4621cc5d4eafdc73ba5d876f933c929d3ace4d54..4a36e8aa4212ed82e883b02ad35657ec1ef49dd6 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -10,7 +10,7 @@
 "No file was uploaded" => "ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ",
 "Missing a temporary folder" => "ãƒ†ãƒ³ãƒãƒ©ãƒªãƒ•ã‚©ãƒ«ãƒ€ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“",
 "Failed to write to disk" => "ãƒ‡ã‚£ã‚¹ã‚¯ã¸ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ",
-"Not enough space available" => "åˆ©ç”¨å¯èƒ½ãªã‚¹ãƒšãƒ¼ã‚¹ãŒååˆ†ã«ã‚ã‚Šã¾ã›ã‚“",
+"Not enough storage available" => "ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã«ååˆ†ãªç©ºãå®¹é‡ãŒã‚ã‚Šã¾ã›ã‚“",
 "Invalid directory." => "ç„¡åŠ¹ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚",
 "Files" => "ãƒ•ã‚¡ã‚¤ãƒ«",
 "Unshare" => "å…±æœ‰ã—ãªã„",
@@ -28,7 +28,9 @@
 "'.' is an invalid file name." => "'.' ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚",
 "File name cannot be empty." => "ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ç©ºã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ã€‚",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ç„¡åŠ¹ãªåå‰ã€'\\', '/', '<', '>', ':', '\"', '|', '?', '*' ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“ã€‚",
-"generating ZIP-file, it may take some time." => "ZIPãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç”Ÿæˆä¸ã§ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€‚",
+"Your storage is full, files can not be updated or synced anymore!" => "ã‚ãªãŸã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã¯ä¸€æ¯ã§ã™ã€‚ãƒ•ã‚¡ã‚¤ãƒ«ã®æ›´æ–°ã¨åŒæœŸã¯ã‚‚ã†ã§ãã¾ã›ã‚“ï¼",
+"Your storage is almost full ({usedSpacePercent}%)" => "ã‚ãªãŸã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã¯ã»ã¼ä¸€æ¯ã§ã™ï¼ˆ{usedSpacePercent}%ï¼‰",
+"Your download is being prepared. This might take some time if the files are big." => "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã®æº–å‚™ä¸ã§ã™ã€‚ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒå¤§ãã„å ´åˆã¯å°‘ã—æ™‚é–“ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚ã—ãã¯0ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“",
 "Upload Error" => "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚¨ãƒ©ãƒ¼",
 "Close" => "é–‰ã˜ã‚‹",
@@ -48,6 +50,7 @@
 "{count} folders" => "{count} ãƒ•ã‚©ãƒ«ãƒ€",
 "1 file" => "1 ãƒ•ã‚¡ã‚¤ãƒ«",
 "{count} files" => "{count} ãƒ•ã‚¡ã‚¤ãƒ«",
+"Upload" => "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰",
 "File handling" => "ãƒ•ã‚¡ã‚¤ãƒ«æ“ä½œ",
 "Maximum upload size" => "æœ€å¤§ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚µã‚¤ã‚º",
 "max. possible: " => "æœ€å¤§å®¹é‡: ",
@@ -60,7 +63,6 @@
 "Text file" => "ãƒ†ã‚ã‚¹ãƒˆãƒ•ã‚¡ã‚¤ãƒ«",
 "Folder" => "ãƒ•ã‚©ãƒ«ãƒ€",
 "From link" => "ãƒªãƒ³ã‚¯",
-"Upload" => "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰",
 "Cancel upload" => "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’ã‚ãƒ£ãƒ³ã‚»ãƒ«",
 "Nothing in here. Upload something!" => "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“ã€‚ä½•ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„ã€‚",
 "Download" => "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
index 9a73abfbe3bfa764ea5d5203ae868ca39aaa5fa7..08225c114d1e1a46cd1c3a1c5007ac11a94fcc82 100644
--- a/apps/files/l10n/ka_GE.php
+++ b/apps/files/l10n/ka_GE.php
@@ -18,7 +18,6 @@
 "replaced {new_name} with {old_name}" => "{new_name} áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ {old_name}â€“áƒ˜áƒ—",
 "unshared {files}" => "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ áƒ›áƒáƒ®áƒ¡áƒœáƒ˜áƒšáƒ˜ {files}",
 "deleted {files}" => "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜ {files}",
-"generating ZIP-file, it may take some time." => "ZIP-áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒ˜áƒ áƒ”áƒ‘áƒ, áƒáƒ›áƒáƒ¡ áƒáƒ˜áƒ áƒ“áƒ”áƒ‘áƒ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒšáƒ˜ áƒ“áƒ áƒ.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ. áƒ˜áƒ¡ áƒáƒ áƒ˜áƒ¡ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ” áƒ“áƒ áƒ¨áƒ”áƒ˜áƒªáƒáƒ•áƒ¡ 0 áƒ‘áƒáƒ˜áƒ¢áƒ¡",
 "Upload Error" => "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡áƒáƒ¡",
 "Close" => "áƒ“áƒáƒ®áƒ£áƒ áƒ•áƒ",
@@ -36,6 +35,7 @@
 "{count} folders" => "{count} áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
 "1 file" => "1 áƒ¤áƒáƒ˜áƒšáƒ˜",
 "{count} files" => "{count} áƒ¤áƒáƒ˜áƒšáƒ˜",
+"Upload" => "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ",
 "File handling" => "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ“áƒáƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ",
 "Maximum upload size" => "áƒ›áƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ› áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ˜áƒ¡ áƒ–áƒáƒ›áƒ",
 "max. possible: " => "áƒ›áƒáƒ¥áƒ¡. áƒ¨áƒ”áƒ¡áƒáƒ«áƒšáƒ”áƒ‘áƒ”áƒšáƒ˜:",
@@ -47,7 +47,6 @@
 "New" => "áƒáƒ®áƒáƒšáƒ˜",
 "Text file" => "áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ£áƒ áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜",
 "Folder" => "áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”",
-"Upload" => "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ",
 "Cancel upload" => "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ",
 "Nothing in here. Upload something!" => "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡. áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ” áƒ áƒáƒ›áƒ”!",
 "Download" => "áƒ©áƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 928b7cbb7e41f6d91453bd10190b08fdca308dc5..cd95d61e4dcbd1ecacae1eef762a27a9f9b9b00b 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -10,7 +10,6 @@
 "No file was uploaded" => "ì—…ë¡œë“œëœ íŒŒì¼ ì—†ìŒ",
 "Missing a temporary folder" => "ìž„ì‹œ í´ë”ê°€ ì‚¬ë¼ì§",
 "Failed to write to disk" => "ë””ìŠ¤í¬ì— ì“°ì§€ ëª»í–ˆìŠµë‹ˆë‹¤",
-"Not enough space available" => "ì—¬ìœ ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤",
 "Invalid directory." => "ì˜¬ë°”ë¥´ì§€ ì•Šì€ ë””ë ‰í† ë¦¬ìž…ë‹ˆë‹¤.",
 "Files" => "íŒŒì¼",
 "Unshare" => "ê³µìœ  í•´ì œ",
@@ -28,7 +27,6 @@
 "'.' is an invalid file name." => "'.' ëŠ” ì˜¬ë°”ë¥´ì§€ ì•Šì€ íŒŒì¼ ì´ë¦„ ìž…ë‹ˆë‹¤.",
 "File name cannot be empty." => "íŒŒì¼ì´ë¦„ì€ ê³µëž€ì´ ë  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "í´ë” ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ ì•ŠìŠµë‹ˆë‹¤. ì´ë¦„ì— ë¬¸ìž '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'ëŠ” ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤.",
-"generating ZIP-file, it may take some time." => "ZIP íŒŒì¼ì„ ìƒì„±í•˜ê³  ìžˆìŠµë‹ˆë‹¤. ì‹œê°„ì´ ê±¸ë¦´ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ì´ íŒŒì¼ì€ ë””ë ‰í„°ë¦¬ì´ê±°ë‚˜ ë¹„ì–´ ìžˆê¸° ë•Œë¬¸ì— ì—…ë¡œë“œí•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤",
 "Upload Error" => "ì—…ë¡œë“œ ì˜¤ë¥˜",
 "Close" => "ë‹«ê¸°",
@@ -48,6 +46,7 @@
 "{count} folders" => "í´ë” {count}ê°œ",
 "1 file" => "íŒŒì¼ 1ê°œ",
 "{count} files" => "íŒŒì¼ {count}ê°œ",
+"Upload" => "ì—…ë¡œë“œ",
 "File handling" => "íŒŒì¼ ì²˜ë¦¬",
 "Maximum upload size" => "ìµœëŒ€ ì—…ë¡œë“œ í¬ê¸°",
 "max. possible: " => "ìµœëŒ€ ê°€ëŠ¥:",
@@ -60,7 +59,6 @@
 "Text file" => "í…ìŠ¤íŠ¸ íŒŒì¼",
 "Folder" => "í´ë”",
 "From link" => "ë§í¬ì—ì„œ",
-"Upload" => "ì—…ë¡œë“œ",
 "Cancel upload" => "ì—…ë¡œë“œ ì·¨ì†Œ",
 "Nothing in here. Upload something!" => "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤!",
 "Download" => "ë‹¤ìš´ë¡œë“œ",
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
index d6cf645079271a45714a7cba2c03248e7767a62e..5c5a3d6bd8fae6d14a19fb6084aac33e367ba13d 100644
--- a/apps/files/l10n/ku_IQ.php
+++ b/apps/files/l10n/ku_IQ.php
@@ -2,8 +2,8 @@
 "Close" => "Ø¯Ø§Ø®Ø³ØªÙ†",
 "URL cannot be empty." => "Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¨Ù‡â€ŒØ³ØªÙ‡â€ŒØ± Ù†Ø§Ø¨ÛŽØª Ø¨Ù‡â€ŒØªØ§Úµ Ø¨ÛŽØª.",
 "Name" => "Ù†Ø§Ùˆ",
+"Upload" => "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†",
 "Save" => "Ù¾Ø§Ø´Ú©Ù‡â€ŒÙˆØªÚ©Ø±Ø¯Ù†",
 "Folder" => "Ø¨ÙˆØ®Ú†Ù‡",
-"Upload" => "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†",
 "Download" => "Ø¯Ø§Ú¯Ø±ØªÙ†"
 );
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 229ec3f20244ab3b1772d8aa3b5b72da8a62aa2b..79ef4bc9417fd0729a574c476f6fd85c9be6b924 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -6,11 +6,11 @@
 "Missing a temporary folder" => "Et feelt en temporÃ¤ren Dossier",
 "Failed to write to disk" => "Konnt net op den Disk schreiwen",
 "Files" => "Dateien",
+"Unshare" => "Net mÃ©i deelen",
 "Delete" => "LÃ¤schen",
 "replace" => "ersetzen",
 "cancel" => "ofbriechen",
 "undo" => "rÃ©ckgÃ¤ngeg man",
-"generating ZIP-file, it may take some time." => "Et  gÃ«tt eng ZIP-File generÃ©iert, dÃ«st ka bÃ«ssen daueren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
 "Upload Error" => "Fehler beim eroplueden",
 "Close" => "Zoumaachen",
@@ -19,6 +19,7 @@
 "Name" => "Numm",
 "Size" => "GrÃ©isst",
 "Modified" => "GeÃ¤nnert",
+"Upload" => "Eroplueden",
 "File handling" => "Fichier handling",
 "Maximum upload size" => "Maximum Upload GrÃ©isst ",
 "max. possible: " => "max. mÃ©iglech:",
@@ -30,7 +31,6 @@
 "New" => "Nei",
 "Text file" => "Text Fichier",
 "Folder" => "Dossier",
-"Upload" => "Eroplueden",
 "Cancel upload" => "Upload ofbriechen",
 "Nothing in here. Upload something!" => "Hei ass nÃ¤ischt. Lued eppes rop!",
 "Download" => "Eroflueden",
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index fd9824e0c1990248214ae688c2d4b9ec2aa73ba4..da209619e2af65aabd7f8831ed94612b9551ec62 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -18,7 +18,6 @@
 "replaced {new_name} with {old_name}" => "pakeiskite {new_name} Ä¯ {old_name}",
 "unshared {files}" => "nebesidalinti {files}",
 "deleted {files}" => "iÅ¡trinti {files}",
-"generating ZIP-file, it may take some time." => "kuriamas ZIP archyvas, tai gali uÅ¾trukti Å¡iek tiek laiko.",
 "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",
@@ -36,6 +35,7 @@
 "{count} folders" => "{count} aplankalai",
 "1 file" => "1 failas",
 "{count} files" => "{count} failai",
+"Upload" => "Ä®kelti",
 "File handling" => "FailÅ³ tvarkymas",
 "Maximum upload size" => "Maksimalus Ä¯keliamo failo dydis",
 "max. possible: " => "maks. galima:",
@@ -47,7 +47,6 @@
 "New" => "Naujas",
 "Text file" => "Teksto failas",
 "Folder" => "Katalogas",
-"Upload" => "Ä®kelti",
 "Cancel upload" => "AtÅ¡aukti siuntimÄ…",
 "Nothing in here. Upload something!" => "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!",
 "Download" => "AtsisiÅ³sti",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 333679849182284d32eed63979a177f2125d6162..b175b19bba94cf435dd293eae6c705d849530578 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -11,7 +11,6 @@
 "suggest name" => "Ieteiktais nosaukums",
 "cancel" => "atcelt",
 "undo" => "vienu soli atpakaÄ¼",
-"generating ZIP-file, it may take some time." => "lai uzÄ£enerÄ“tu ZIP failu, kÄds brÄ«dis ir jÄpagaida",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nav iespÄ“jams augÅ¡uplÄdÄ“t jÅ«su failu, jo tÄds jau eksistÄ“ vai arÄ« failam nav izmÄ“ra (0 baiti)",
 "Upload Error" => "AugÅ¡uplÄdÄ“Å¡anas laikÄ radÄs kÄ¼Å«da",
 "Pending" => "Gaida savu kÄrtu",
@@ -20,6 +19,7 @@
 "Name" => "Nosaukums",
 "Size" => "IzmÄ“rs",
 "Modified" => "IzmainÄ«ts",
+"Upload" => "AugÅ¡uplÄdet",
 "File handling" => "Failu pÄrvaldÄ«ba",
 "Maximum upload size" => "MaksimÄlais failu augÅ¡uplÄdes apjoms",
 "max. possible: " => "maksÄ«mÄlais iespÄ“jamais:",
@@ -30,7 +30,6 @@
 "New" => "Jauns",
 "Text file" => "Teksta fails",
 "Folder" => "Mape",
-"Upload" => "AugÅ¡uplÄdet",
 "Cancel upload" => "Atcelt augÅ¡uplÄdi",
 "Nothing in here. Upload something!" => "Te vÄ“l nekas nav. RÄ«kojies, sÄc augÅ¡uplÄdÄ“t",
 "Download" => "LejuplÄdÄ“t",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index 3f48a69874efc99bb6694c51f33ba750ff08176c..0ca08d6bc6a99d71f308f0faa961166fe42d96d9 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -21,7 +21,6 @@
 "unshared {files}" => "Ð±ÐµÐ· ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ {files}",
 "deleted {files}" => "Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐ°Ð½Ð¸ {files}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð¼Ðµ. , '\\', '/', '<', '>', ':', '\"', '|', '?' Ð¸ '*' Ð½Ðµ ÑÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸.",
-"generating ZIP-file, it may take some time." => "Ð¡Ðµ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð° ZIP Ñ„Ð°Ñ˜Ð»Ð¾Ñ‚, ÑœÐµ Ñ‚Ñ€ÐµÐ±Ð° Ð¸Ð·Ð²ÐµÑÐ½Ð¾ Ð²Ñ€ÐµÐ¼Ðµ.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿Ñ€ÐµÐ·ÐµÐ¼Ðµ Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ð±Ð¸Ð´ÐµÑ˜ÑœÐ¸ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð¾Ñ‚ Ð²Ð¾ ÐºÐ¾Ñ˜ ÑÐµ Ð½Ð°Ð¾Ñ“Ð° Ñ„Ð°Ñ˜Ð»Ð¾Ñ‚ Ð¸Ð¼Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð° Ð¾Ð´ 0 Ð±Ð°Ñ˜Ñ‚Ð¸",
 "Upload Error" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ",
 "Close" => "Ð—Ð°Ñ‚Ð²Ð¾Ð¸",
@@ -40,6 +39,7 @@
 "{count} folders" => "{count} Ð¿Ð°Ð¿ÐºÐ¸",
 "1 file" => "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°",
 "{count} files" => "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸",
+"Upload" => "ÐŸÐ¾Ð´Ð¸Ð³Ð½Ð¸",
 "File handling" => "Ð Ð°ÐºÑƒÐ²Ð°ÑšÐµ ÑÐ¾ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸",
 "Maximum upload size" => "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð° Ð·Ð° Ð¿Ð¾Ð´Ð¸Ð³Ð°ÑšÐµ",
 "max. possible: " => "Ð¼Ð°ÐºÑ. Ð¼Ð¾Ð¶Ð½Ð¾:",
@@ -52,7 +52,6 @@
 "Text file" => "Ð¢ÐµÐºÑÑ‚ÑƒÐ°Ð»Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°",
 "Folder" => "ÐŸÐ°Ð¿ÐºÐ°",
 "From link" => "ÐžÐ´ Ð²Ñ€ÑÐºÐ°",
-"Upload" => "ÐŸÐ¾Ð´Ð¸Ð³Ð½Ð¸",
 "Cancel upload" => "ÐžÑ‚ÐºÐ°Ð¶Ð¸ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÑƒÐ²Ð°ÑšÐµ",
 "Nothing in here. Upload something!" => "Ð¢ÑƒÐºÐ° Ð½ÐµÐ¼Ð° Ð½Ð¸ÑˆÑ‚Ð¾. Ð¡Ð½Ð¸Ð¼ÐµÑ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾!",
 "Download" => "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð¸",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 7fa87840842efc40b9fa73de22cce904516510d7..4ac26d80918281f242aafe25f097d28ea350215d 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -10,7 +10,6 @@
 "Delete" => "Padam",
 "replace" => "ganti",
 "cancel" => "Batal",
-"generating ZIP-file, it may take some time." => "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau saiz fail 0 bytes",
 "Upload Error" => "Muat naik ralat",
 "Close" => "Tutup",
@@ -19,6 +18,7 @@
 "Name" => "Nama ",
 "Size" => "Saiz",
 "Modified" => "Dimodifikasi",
+"Upload" => "Muat naik",
 "File handling" => "Pengendalian fail",
 "Maximum upload size" => "Saiz maksimum muat naik",
 "max. possible: " => "maksimum:",
@@ -30,7 +30,6 @@
 "New" => "Baru",
 "Text file" => "Fail teks",
 "Folder" => "Folder",
-"Upload" => "Muat naik",
 "Cancel upload" => "Batal muat naik",
 "Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
 "Download" => "Muat turun",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 9be868164b1551ae9f28fdc92980aab608bbb890..8bb7cfb2f9c0f0d15a61c79be34ae77ce7075921 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -19,7 +19,6 @@
 "replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
 "deleted {files}" => "slettet {files}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
-"generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
 "Upload Error" => "Opplasting feilet",
 "Close" => "Lukk",
@@ -38,6 +37,7 @@
 "{count} folders" => "{count} mapper",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Upload" => "Last opp",
 "File handling" => "FilhÃ¥ndtering",
 "Maximum upload size" => "Maksimum opplastingsstÃ¸rrelse",
 "max. possible: " => "max. mulige:",
@@ -50,7 +50,6 @@
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
 "From link" => "Fra link",
-"Upload" => "Last opp",
 "Cancel upload" => "Avbryt opplasting",
 "Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
 "Download" => "Last ned",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 77219abcf20d906092e83b5ff26c87d47b0731b8..c78ac346d13057bc03d30854770660a17037286e 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
+"Could not move %s" => "Kon %s niet verplaatsen",
+"Unable to rename file" => "Kan bestand niet hernoemen",
 "No file was uploaded. Unknown error" => "Er was geen bestand geladen.  Onbekende fout",
 "There is no error, the file uploaded with success" => "Geen fout opgetreden, bestand successvol geupload.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geÃ¼ploade bestand overscheidt de upload_max_filesize optie in php.ini:",
@@ -7,7 +10,6 @@
 "No file was uploaded" => "Geen bestand geÃ¼pload",
 "Missing a temporary folder" => "Een tijdelijke map mist",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
-"Not enough space available" => "Niet genoeg ruimte beschikbaar",
 "Invalid directory." => "Ongeldige directory.",
 "Files" => "Bestanden",
 "Unshare" => "Stop delen",
@@ -25,7 +27,7 @@
 "'.' is an invalid file name." => "'.' is een ongeldige bestandsnaam.",
 "File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
-"generating ZIP-file, it may take some time." => "aanmaken ZIP-file, dit kan enige tijd duren.",
+"Your download is being prepared. This might take some time if the files are big." => "Uw download wordt voorbereid. Dit kan enige tijd duren bij grote bestanden.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "uploaden van de file mislukt, het is of een directory of de bestandsgrootte is 0 bytes",
 "Upload Error" => "Upload Fout",
 "Close" => "Sluit",
@@ -35,6 +37,7 @@
 "Upload cancelled." => "Uploaden geannuleerd.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
 "URL cannot be empty." => "URL kan niet leeg zijn.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud",
 "{count} files scanned" => "{count} bestanden gescanned",
 "error while scanning" => "Fout tijdens het scannen",
 "Name" => "Naam",
@@ -44,6 +47,7 @@
 "{count} folders" => "{count} mappen",
 "1 file" => "1 bestand",
 "{count} files" => "{count} bestanden",
+"Upload" => "Upload",
 "File handling" => "Bestand",
 "Maximum upload size" => "Maximale bestandsgrootte voor uploads",
 "max. possible: " => "max. mogelijk: ",
@@ -56,7 +60,6 @@
 "Text file" => "Tekstbestand",
 "Folder" => "Map",
 "From link" => "Vanaf link",
-"Upload" => "Upload",
 "Cancel upload" => "Upload afbreken",
 "Nothing in here. Upload something!" => "Er bevindt zich hier niets. Upload een bestand!",
 "Download" => "Download",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 04e01a39cfc86c3b60e96e8ecec391f8e8a5884a..8a4ab91ea7ec74d9cc21fdfad63d5545ba76d78b 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -10,12 +10,12 @@
 "Name" => "Namn",
 "Size" => "Storleik",
 "Modified" => "Endra",
+"Upload" => "Last opp",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
 "Save" => "Lagre",
 "New" => "Ny",
 "Text file" => "Tekst fil",
 "Folder" => "Mappe",
-"Upload" => "Last opp",
 "Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
 "Download" => "Last ned",
 "Upload too large" => "For stor opplasting",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 36bbb433394c6b8095d851cb18d594ccf897ea75..76c8d6b655ae485d0dbfdeab39e542d4573a2f67 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -13,7 +13,6 @@
 "suggest name" => "nom prepausat",
 "cancel" => "anulla",
 "undo" => "defar",
-"generating ZIP-file, it may take some time." => "FichiÃ¨r ZIP a se far, aquÃ² pÃ²t trigar un briu.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossible d'amontcargar lo teu fichiÃ¨r qu'es un repertÃ²ri o que ten pas que 0 octet.",
 "Upload Error" => "Error d'amontcargar",
 "Pending" => "Al esperar",
@@ -24,6 +23,7 @@
 "Name" => "Nom",
 "Size" => "Talha",
 "Modified" => "Modificat",
+"Upload" => "Amontcarga",
 "File handling" => "Manejament de fichiÃ¨r",
 "Maximum upload size" => "Talha maximum d'amontcargament",
 "max. possible: " => "max. possible: ",
@@ -35,7 +35,6 @@
 "New" => "NÃ²u",
 "Text file" => "FichiÃ¨r de tÃ¨xte",
 "Folder" => "DorsiÃ¨r",
-"Upload" => "Amontcarga",
 "Cancel upload" => " Anulla l'amontcargar",
 "Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
 "Download" => "Avalcarga",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index b96048cf002e515065b0740798b4a9043c1bf2e1..477e14491f77c741510e35d9a3b3da6633ab5fd1 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Nie moÅ¼na byÅ‚o przenieÅ›Ä‡ %s - Plik o takiej nazwie juÅ¼ istnieje",
+"Could not move %s" => "Nie moÅ¼na byÅ‚o przenieÅ›Ä‡ %s",
+"Unable to rename file" => "Nie moÅ¼na zmieniÄ‡ nazwy pliku",
 "No file was uploaded. Unknown error" => "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: ",
@@ -7,7 +10,6 @@
 "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 space available" => "Za maÅ‚o miejsca",
 "Invalid directory." => "ZÅ‚a Å›cieÅ¼ka.",
 "Files" => "Pliki",
 "Unshare" => "Nie udostÄ™pniaj",
@@ -25,7 +27,6 @@
 "'.' 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.",
-"generating ZIP-file, it may take some time." => "Generowanie pliku ZIP, moÅ¼e potrwaÄ‡ pewien czas.",
 "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",
 "Upload Error" => "BÅ‚Ä…d wczytywania",
 "Close" => "Zamknij",
@@ -45,6 +46,7 @@
 "{count} folders" => "{count} foldery",
 "1 file" => "1 plik",
 "{count} files" => "{count} pliki",
+"Upload" => "PrzeÅ›lij",
 "File handling" => "ZarzÄ…dzanie plikami",
 "Maximum upload size" => "Maksymalny rozmiar wysyÅ‚anego pliku",
 "max. possible: " => "max. moÅ¼liwych",
@@ -57,7 +59,6 @@
 "Text file" => "Plik tekstowy",
 "Folder" => "Katalog",
 "From link" => "Z linku",
-"Upload" => "PrzeÅ›lij",
 "Cancel upload" => "PrzestaÅ„ wysyÅ‚aÄ‡",
 "Nothing in here. Upload something!" => "Brak zawartoÅ›ci. ProszÄ™ wysÅ‚aÄ‡ pliki!",
 "Download" => "Pobiera element",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index ece24c7a2fa756bfa015a8382aa1e99f52f2f05e..33014297ee5c88b77785a8f5bc0e5ec699c7db3c 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -21,7 +21,6 @@
 "unshared {files}" => "{files} nÃ£o compartilhados",
 "deleted {files}" => "{files} apagados",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome invÃ¡lido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' nÃ£o sÃ£o permitidos.",
-"generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
 "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.",
 "Upload Error" => "Erro de envio",
 "Close" => "Fechar",
@@ -40,6 +39,7 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 arquivo",
 "{count} files" => "{count} arquivos",
+"Upload" => "Carregar",
 "File handling" => "Tratamento de Arquivo",
 "Maximum upload size" => "Tamanho mÃ¡ximo para carregar",
 "max. possible: " => "max. possÃvel:",
@@ -52,7 +52,6 @@
 "Text file" => "Arquivo texto",
 "Folder" => "Pasta",
 "From link" => "Do link",
-"Upload" => "Carregar",
 "Cancel upload" => "Cancelar upload",
 "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
 "Download" => "Baixar",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index fb22894b34e5d41e73809216767fa6148e8906b8..6cee8d9d88e9a3c7f5ddec9ae7e2877c1cbf0738 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -10,7 +10,7 @@
 "No file was uploaded" => "NÃ£o foi enviado nenhum ficheiro",
 "Missing a temporary folder" => "Falta uma pasta temporÃ¡ria",
 "Failed to write to disk" => "Falhou a escrita no disco",
-"Not enough space available" => "EspaÃ§o em disco insuficiente!",
+"Not enough storage available" => "NÃ£o hÃ¡ espaÃ§o suficiente em disco",
 "Invalid directory." => "DirectÃ³rio InvÃ¡lido",
 "Files" => "Ficheiros",
 "Unshare" => "Deixar de partilhar",
@@ -18,7 +18,7 @@
 "Rename" => "Renomear",
 "{new_name} already exists" => "O nome {new_name} jÃ¡ existe",
 "replace" => "substituir",
-"suggest name" => "Sugira um nome",
+"suggest name" => "sugira um nome",
 "cancel" => "cancelar",
 "replaced {new_name}" => "{new_name} substituido",
 "undo" => "desfazer",
@@ -28,14 +28,16 @@
 "'.' is an invalid file name." => "'.' nÃ£o Ã© um nome de ficheiro vÃ¡lido!",
 "File name cannot be empty." => "O nome do ficheiro nÃ£o pode estar vazio.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome InvÃ¡lido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' nÃ£o sÃ£o permitidos.",
-"generating ZIP-file, it may take some time." => "a gerar o ficheiro ZIP, poderÃ¡ demorar algum tempo.",
+"Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento estÃ¡ cheio, os ficheiros nÃ£o podem ser sincronizados.",
+"Your storage is almost full ({usedSpacePercent}%)" => "O seu espaÃ§o de armazenamento estÃ¡ quase cheiro ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "O seu download estÃ¡ a ser preparado. Este processo pode demorar algum tempo se os ficheiros forem grandes.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "NÃ£o Ã© possÃvel fazer o envio do ficheiro devido a ser uma pasta ou ter 0 bytes",
 "Upload Error" => "Erro no envio",
 "Close" => "Fechar",
 "Pending" => "Pendente",
 "1 file uploading" => "A enviar 1 ficheiro",
 "{count} files uploading" => "A carregar {count} ficheiros",
-"Upload cancelled." => "O envio foi cancelado.",
+"Upload cancelled." => "Envio cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. IrÃ¡ cancelar o envio se sair da pÃ¡gina agora.",
 "URL cannot be empty." => "O URL nÃ£o pode estar vazio.",
 "Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Nome de pasta invÃ¡lido. O Uso de 'shared' Ã© reservado para o ownCloud",
@@ -48,6 +50,7 @@
 "{count} folders" => "{count} pastas",
 "1 file" => "1 ficheiro",
 "{count} files" => "{count} ficheiros",
+"Upload" => "Enviar",
 "File handling" => "Manuseamento de ficheiros",
 "Maximum upload size" => "Tamanho mÃ¡ximo de envio",
 "max. possible: " => "max. possivel: ",
@@ -60,7 +63,6 @@
 "Text file" => "Ficheiro de texto",
 "Folder" => "Pasta",
 "From link" => "Da ligaÃ§Ã£o",
-"Upload" => "Enviar",
 "Cancel upload" => "Cancelar envio",
 "Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
 "Download" => "Transferir",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index c34a341e53f48fdcdc7ce8c24a45438bf699acb2..424450e920fa01c22158c568a6b988474ed20dd9 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Nu se poate de mutat %s - FiÈ™ier cu acest nume deja existÄƒ",
 "Could not move %s" => "Nu s-a putut muta %s",
 "Unable to rename file" => "Nu s-a putut redenumi fiÈ™ierul",
 "No file was uploaded. Unknown error" => "Nici un fiÈ™ier nu a fost Ã®ncÄƒrcat. Eroare necunoscutÄƒ",
@@ -9,7 +10,6 @@
 "No file was uploaded" => "Niciun fiÈ™ier Ã®ncÄƒrcat",
 "Missing a temporary folder" => "LipseÈ™te un dosar temporar",
 "Failed to write to disk" => "Eroare la scriere pe disc",
-"Not enough space available" => "Nu este suficient spaÈ›iu disponibil",
 "Invalid directory." => "Director invalid.",
 "Files" => "FiÈ™iere",
 "Unshare" => "AnuleazÄƒ partajarea",
@@ -27,7 +27,7 @@
 "'.' 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.",
-"generating ZIP-file, it may take some time." => "se generazÄƒ fiÈ™ierul ZIP, va dura ceva timp.",
+"Your download is being prepared. This might take some time if the files are big." => "Se pregÄƒteÈ™te descÄƒrcarea. Aceasta poate sÄƒ dureze ceva timp dacÄƒ fiÈ™ierele sunt mari.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nu s-a putut Ã®ncÄƒrca fiÈ™ierul tÄƒu deoarece pare sÄƒ fie un director sau are 0 bytes.",
 "Upload Error" => "Eroare la Ã®ncÄƒrcare",
 "Close" => "ÃŽnchide",
@@ -37,6 +37,7 @@
 "Upload cancelled." => "ÃŽncÄƒrcare anulatÄƒ.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "FiÈ™ierul este Ã®n curs de Ã®ncÄƒrcare. PÄƒrÄƒsirea paginii va Ã®ntrerupe Ã®ncÄƒrcarea.",
 "URL cannot be empty." => "Adresa URL nu poate fi goalÄƒ.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "Invalid folder name. Usage of 'Shared' is reserved by Ownclou",
 "{count} files scanned" => "{count} fisiere scanate",
 "error while scanning" => "eroare la scanarea",
 "Name" => "Nume",
@@ -46,6 +47,7 @@
 "{count} folders" => "{count} foldare",
 "1 file" => "1 fisier",
 "{count} files" => "{count} fisiere",
+"Upload" => "ÃŽncarcÄƒ",
 "File handling" => "Manipulare fiÈ™iere",
 "Maximum upload size" => "Dimensiune maximÄƒ admisÄƒ la Ã®ncÄƒrcare",
 "max. possible: " => "max. posibil:",
@@ -58,7 +60,6 @@
 "Text file" => "FiÈ™ier text",
 "Folder" => "Dosar",
 "From link" => "de la adresa",
-"Upload" => "ÃŽncarcÄƒ",
 "Cancel upload" => "AnuleazÄƒ Ã®ncÄƒrcarea",
 "Nothing in here. Upload something!" => "Nimic aici. ÃŽncarcÄƒ ceva!",
 "Download" => "DescarcÄƒ",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 49ead61f67ecd0eb75ea6d3d9e8f6d66b5b1f5c3..ae103a9e81042dd49aec43c1374628cc0c06dbcb 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -10,7 +10,6 @@
 "No file was uploaded" => "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½",
 "Missing a temporary folder" => "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½ÑƒÑŽ Ð¿Ð°Ð¿ÐºÑƒ",
 "Failed to write to disk" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð½Ð° Ð´Ð¸ÑÐº",
-"Not enough space available" => "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑ‚Ð°",
 "Invalid directory." => "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³.",
 "Files" => "Ð¤Ð°Ð¹Ð»Ñ‹",
 "Unshare" => "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸ÑŽ",
@@ -28,7 +27,6 @@
 "'.' is an invalid file name." => "'.' - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°.",
 "File name cannot be empty." => "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð¸Ð¼Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' Ð¸ '*' Ð½ÐµÐ´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹.",
-"generating ZIP-file, it may take some time." => "ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ZIP-Ñ„Ð°Ð¹Ð»Ð°, ÑÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ÐÐµ ÑƒÐ´Ð°ÐµÑ‚ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ñ€Ð°Ð·Ð¼ÐµÑ€Ð¾Ð¼ 0 Ð±Ð°Ð¹Ñ‚ Ð² ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³",
 "Upload Error" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
 "Close" => "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ",
@@ -48,6 +46,7 @@
 "{count} folders" => "{count} Ð¿Ð°Ð¿Ð¾Ðº",
 "1 file" => "1 Ñ„Ð°Ð¹Ð»",
 "{count} files" => "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð²",
+"Upload" => "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ",
 "File handling" => "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸",
 "Maximum upload size" => "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°",
 "max. possible: " => "Ð¼Ð°ÐºÑ. Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾: ",
@@ -60,7 +59,6 @@
 "Text file" => "Ð¢ÐµÐºÑÑ‚Ð¾Ð²Ñ‹Ð¹ Ñ„Ð°Ð¹Ð»",
 "Folder" => "ÐŸÐ°Ð¿ÐºÐ°",
 "From link" => "Ð˜Ð· ÑÑÑ‹Ð»ÐºÐ¸",
-"Upload" => "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ",
 "Cancel upload" => "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
 "Nothing in here. Upload something!" => "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚. Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ!",
 "Download" => "Ð¡ÐºÐ°Ñ‡Ð°Ñ‚ÑŒ",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 16bcc54e59f6f62a39f5236de18b83a6354c3fa9..60a7fd0f71eea78a440faf093fcc175bcd937ee1 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -21,7 +21,6 @@
 "unshared {files}" => "CÐ¾Ð²Ð¼ÐµÑÑ‚Ð½Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‰ÐµÐ½Ð¾ {Ñ„Ð°Ð¹Ð»Ñ‹}",
 "deleted {files}" => "ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾ {Ñ„Ð°Ð¹Ð»Ñ‹}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ðµ Ð¸Ð¼Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' Ð¸ '*' Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹.",
-"generating ZIP-file, it may take some time." => "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ZIP-Ñ„Ð°Ð¹Ð»Ð°, ÑÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»,\n Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¾Ð½ Ð¸Ð¼ÐµÐµÑ‚ Ð½ÑƒÐ»ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð¸Ð»Ð¸ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹",
 "Upload Error" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
 "Close" => "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ",
@@ -40,6 +39,7 @@
 "{count} folders" => "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ð¿Ð°Ð¿Ð¾Ðº",
 "1 file" => "1 Ñ„Ð°Ð¹Ð»",
 "{count} files" => "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ñ„Ð°Ð¹Ð»Ð¾Ð²",
+"Upload" => "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ",
 "File handling" => "Ð Ð°Ð±Ð¾Ñ‚Ð° Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸",
 "Maximum upload size" => "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð°",
 "max. possible: " => "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ð¹",
@@ -52,7 +52,6 @@
 "Text file" => "Ð¢ÐµÐºÑÑ‚Ð¾Ð²Ñ‹Ð¹ Ñ„Ð°Ð¹Ð»",
 "Folder" => "ÐŸÐ°Ð¿ÐºÐ°",
 "From link" => "ÐŸÐ¾ ÑÑÑ‹Ð»ÐºÐµ",
-"Upload" => "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ",
 "Cancel upload" => "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸",
 "Nothing in here. Upload something!" => "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚. Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ!",
 "Download" => "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index e1e06c4f814f5c6b87c85e8a489058f1e4bea125..133737cb57af1717c4286edb22c49b2907bc0138 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -14,7 +14,6 @@
 "suggest name" => "à¶±à¶¸à¶šà·Š à¶ºà·à¶¢à¶±à· à¶šà¶»à¶±à·Šà¶±",
 "cancel" => "à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±",
 "undo" => "à¶±à·’à·‚à·Šà¶´à·Šâ€à¶»à¶· à¶šà¶»à¶±à·Šà¶±",
-"generating ZIP-file, it may take some time." => "à¶œà·œà¶±à·”à·€à¶šà·Š à·ƒà·‘à¶¯à·™à¶¸à·’à¶±à·Š à¶´à·€à¶à·“. à¶šà·™à¶§à·’ à·€à·šà¶½à·à·€à¶šà·Š à¶œà¶ à·€à·’à¶º à·„à·à¶š",
 "Upload Error" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·à¶ºà¶šà·Š",
 "Close" => "à·€à·ƒà¶±à·Šà¶±",
 "1 file uploading" => "1 à¶œà·œà¶±à·”à·€à¶šà·Š à¶‹à¶©à¶œà¶ à¶šà·™à¶»à·š",
@@ -27,6 +26,7 @@
 "Modified" => "à·€à·™à¶±à·ƒà·Š à¶šà·…",
 "1 folder" => "1 à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š",
 "1 file" => "1 à¶œà·œà¶±à·”à·€à¶šà·Š",
+"Upload" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸",
 "File handling" => "à¶œà·œà¶±à·” à¶´à¶»à·’à·„à¶»à¶«à¶º",
 "Maximum upload size" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à¶š à¶‹à¶´à¶»à·’à¶¸ à¶´à·Šâ€à¶»à¶¸à·à¶«à¶º",
 "max. possible: " => "à·„à·à¶šà·’ à¶‹à¶´à¶»à·’à¶¸à¶º:",
@@ -39,7 +39,6 @@
 "Text file" => "à¶´à·™à·… à¶œà·œà¶±à·”à·€",
 "Folder" => "à·†à·à¶½à·Šà¶©à¶»à¶º",
 "From link" => "à¶ºà·œà¶¸à·”à·€à·™à¶±à·Š",
-"Upload" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸",
 "Cancel upload" => "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±",
 "Nothing in here. Upload something!" => "à¶¸à·™à·„à·’ à¶šà·’à·ƒà·’à·€à¶šà·Š à¶±à·œà¶¸à·à¶. à¶ºà¶¸à¶šà·Š à¶‹à¶©à·”à¶œà¶ à¶šà¶»à¶±à·Šà¶±",
 "Download" => "à¶¶à·à¶œà¶ à¶šà·’à¶»à·“à¶¸",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 003b1aff225e4e6d7f877d00df2fe65040b7660a..bae5670d061d65c85e13768c56b0eff9fd69907d 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Nie je moÅ¾nÃ© presunÃºÅ¥ %s - sÃºbor s tÃ½mto menom uÅ¾ existuje",
+"Could not move %s" => "Nie je moÅ¾nÃ© presunÃºÅ¥ %s",
+"Unable to rename file" => "NemoÅ¾no premenovaÅ¥ sÃºbor",
 "No file was uploaded. Unknown error" => "Å½iaden sÃºbor nebol odoslanÃ½. NeznÃ¡ma chyba",
 "There is no error, the file uploaded with success" => "Nenastala Å¾iadna chyba, sÃºbor bol ÃºspeÅ¡ne nahranÃ½",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "NahranÃ½ sÃºbor predÄil  konfiguraÄnÃº direktÃvu upload_max_filesize v sÃºbore php.ini:",
@@ -7,6 +10,7 @@
 "No file was uploaded" => "Å½iaden sÃºbor nebol nahranÃ½",
 "Missing a temporary folder" => "ChÃ½bajÃºci doÄasnÃ½ prieÄinok",
 "Failed to write to disk" => "ZÃ¡pis na disk sa nepodaril",
+"Invalid directory." => "NeplatnÃ½ adresÃ¡r",
 "Files" => "SÃºbory",
 "Unshare" => "NezdielaÅ¥",
 "Delete" => "OdstrÃ¡niÅ¥",
@@ -20,8 +24,10 @@
 "replaced {new_name} with {old_name}" => "prepÃsanÃ½ {new_name} sÃºborom {old_name}",
 "unshared {files}" => "zdieÄ¾anie zruÅ¡enÃ© pre {files}",
 "deleted {files}" => "zmazanÃ© {files}",
+"'.' is an invalid file name." => "'.' je neplatnÃ© meno sÃºboru.",
+"File name cannot be empty." => "Meno sÃºboru nemÃ´Å¾e byÅ¥ prÃ¡zdne",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "NesprÃ¡vne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sÃº povolenÃ© hodnoty.",
-"generating ZIP-file, it may take some time." => "generujem ZIP-sÃºbor, mÃ´Å¾e to chvÃÄ¾u trvaÅ¥.",
+"Your download is being prepared. This might take some time if the files are big." => "VaÅ¡e sÅ¥ahovanie sa pripravuje. Ak sÃº sÅ¥ahovanÃ© sÃºbory veÄ¾kÃ©, mÃ´Å¾e to chvÃÄ¾u trvaÅ¥.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "NemÃ´Å¾em nahraÅ¥ sÃºbor lebo je to prieÄinok alebo mÃ¡ 0 bajtov.",
 "Upload Error" => "Chyba odosielania",
 "Close" => "ZavrieÅ¥",
@@ -31,6 +37,7 @@
 "Upload cancelled." => "Odosielanie zruÅ¡enÃ©",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie strÃ¡nky zruÅ¡Ã prÃ¡ve prebiehajÃºce odosielanie sÃºboru.",
 "URL cannot be empty." => "URL nemÃ´Å¾e byÅ¥ prÃ¡zdne",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "NeplatnÃ© meno adresÃ¡ra. PouÅ¾Ãvanie mena 'Shared' je vyhradenÃ© len pre Owncloud",
 "{count} files scanned" => "{count} sÃºborov prehÄ¾adanÃ½ch",
 "error while scanning" => "chyba poÄas kontroly",
 "Name" => "Meno",
@@ -40,6 +47,7 @@
 "{count} folders" => "{count} prieÄinkov",
 "1 file" => "1 sÃºbor",
 "{count} files" => "{count} sÃºborov",
+"Upload" => "OdoslaÅ¥",
 "File handling" => "Nastavenie sprÃ¡vanie k sÃºborom",
 "Maximum upload size" => "MaximÃ¡lna veÄ¾kosÅ¥ odosielanÃ©ho sÃºboru",
 "max. possible: " => "najvÃ¤ÄÅ¡ie moÅ¾nÃ©:",
@@ -52,7 +60,6 @@
 "Text file" => "TextovÃ½ sÃºbor",
 "Folder" => "PrieÄinok",
 "From link" => "Z odkazu",
-"Upload" => "OdoslaÅ¥",
 "Cancel upload" => "ZruÅ¡iÅ¥ odosielanie",
 "Nothing in here. Upload something!" => "Å½iadny sÃºbor. Nahrajte nieÄo!",
 "Download" => "StiahnuÅ¥",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 2a0f450638636db63aebba27fe3fe1908d905ea2..fbc6ab83b8b5d1ad0551a170a30f311eaf85283b 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -21,7 +21,6 @@
 "unshared {files}" => "odstranjeno iz souporabe {files}",
 "deleted {files}" => "izbrisano {files}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
-"generating ZIP-file, it may take some time." => "Ustvarjanje datoteke ZIP. To lahko traja nekaj Äasa.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "PoÅ¡iljanje ni mogoÄe, saj gre za mapo, ali pa je datoteka velikosti 0 bajtov.",
 "Upload Error" => "Napaka med nalaganjem",
 "Close" => "Zapri",
@@ -40,6 +39,7 @@
 "{count} folders" => "{count} map",
 "1 file" => "1 datoteka",
 "{count} files" => "{count} datotek",
+"Upload" => "PoÅ¡lji",
 "File handling" => "Upravljanje z datotekami",
 "Maximum upload size" => "NajveÄja velikost za poÅ¡iljanja",
 "max. possible: " => "najveÄ mogoÄe:",
@@ -52,7 +52,6 @@
 "Text file" => "Besedilna datoteka",
 "Folder" => "Mapa",
 "From link" => "Iz povezave",
-"Upload" => "PoÅ¡lji",
 "Cancel upload" => "PrekliÄi poÅ¡iljanje",
 "Nothing in here. Upload something!" => "Tukaj ni niÄesar. NaloÅ¾ite kaj!",
 "Download" => "Prejmi",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index ecde8be4cc0fdf357324bc1b7f61edb6e742ff61..71da2da4d144eb4b28e1ace01ca26d0b00f48b80 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -20,7 +20,6 @@
 "unshared {files}" => "ÑƒÐºÐ¸Ð½ÑƒÑ‚Ð¾ Ð´ÐµÑ™ÐµÑšÐµ {files}",
 "deleted {files}" => "Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½Ð¾ {files}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ÐÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð°Ð½ Ð½Ð°Ð·Ð¸Ð². Ð¡Ð»ÐµÐ´ÐµÑ›Ð¸ Ð·Ð½Ð°ÐºÐ¾Ð²Ð¸ Ð½Ð¸ÑÑƒ Ð´Ð¾Ð·Ð²Ð¾Ñ™ÐµÐ½Ð¸: \\, /, <, >, :, \", |, ? Ð¸ *.",
-"generating ZIP-file, it may take some time." => "Ð¿Ñ€Ð°Ð²Ð¸Ð¼ ZIP Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒâ€¦",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð¸Ð¼ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ ÐºÐ°Ð¾ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ñƒ Ð¸Ð»Ð¸ Ð¾Ð½Ð° Ð¸Ð¼Ð° 0 Ð±Ð°Ñ˜Ñ‚Ð¾Ð²Ð°",
 "Upload Error" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÑƒ",
 "Close" => "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸",
@@ -38,6 +37,7 @@
 "{count} folders" => "{count} Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ/Ð¸",
 "1 file" => "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°",
 "{count} files" => "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ/Ð°",
+"Upload" => "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸",
 "File handling" => "Ð£Ð¿Ñ€Ð°Ð²Ñ™Ð°ÑšÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ð¼Ð°",
 "Maximum upload size" => "ÐÐ°Ñ˜Ð²ÐµÑ›Ð° Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ",
 "max. possible: " => "Ð½Ð°Ñ˜Ð²ÐµÑ›Ð° Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð°:",
@@ -50,7 +50,6 @@
 "Text file" => "Ñ‚ÐµÐºÑÑ‚ÑƒÐ°Ð»Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°",
 "Folder" => "Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°",
 "From link" => "Ð¡Ð° Ð²ÐµÐ·Ðµ",
-"Upload" => "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸",
 "Cancel upload" => "ÐŸÑ€ÐµÐºÐ¸Ð½Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ",
 "Nothing in here. Upload something!" => "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸Ñ‡ÐµÐ³. ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸Ñ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾!",
 "Download" => "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸",
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index fddaf5840cea10fe137c9cdc119f8b1731d4dd07..0fda24532dca3d034d3b4cc57968d59ddd6cb9a0 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -10,9 +10,9 @@
 "Name" => "Ime",
 "Size" => "VeliÄina",
 "Modified" => "Zadnja izmena",
+"Upload" => "PoÅ¡alji",
 "Maximum upload size" => "Maksimalna veliÄina poÅ¡iljke",
 "Save" => "Snimi",
-"Upload" => "PoÅ¡alji",
 "Nothing in here. Upload something!" => "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!",
 "Download" => "Preuzmi",
 "Upload too large" => "PoÅ¡iljka je prevelika",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 7277ec178526979f0d7d22fd2d1e6cea5dc86a4e..ebcb4626fc87d69c48d3f3b08b0498cf12c40d60 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "Kunde inte flytta %s - Det finns redan en fil med detta namn",
+"Could not move %s" => "Kan inte flytta %s",
+"Unable to rename file" => "Kan inte byta namn pÃ¥ filen",
 "No file was uploaded. Unknown error" => "Ingen fil uppladdad. OkÃ¤nt fel",
 "There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uppladdade filen Ã¶verskrider upload_max_filesize direktivet php.ini:",
@@ -7,7 +10,7 @@
 "No file was uploaded" => "Ingen fil blev uppladdad",
 "Missing a temporary folder" => "Saknar en tillfÃ¤llig mapp",
 "Failed to write to disk" => "Misslyckades spara till disk",
-"Not enough space available" => "Inte tillrÃ¤ckligt med utrymme tillgÃ¤ngligt",
+"Not enough storage available" => "Inte tillrÃ¤ckligt med lagringsutrymme tillgÃ¤ngligt",
 "Invalid directory." => "Felaktig mapp.",
 "Files" => "Filer",
 "Unshare" => "Sluta dela",
@@ -25,7 +28,9 @@
 "'.' is an invalid file name." => "'.' Ã¤r ett ogiltigt filnamn.",
 "File name cannot be empty." => "Filnamn kan inte vara tomt.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' Ã¤r inte tillÃ¥tet.",
-"generating ZIP-file, it may take some time." => "genererar ZIP-fil, det kan ta lite tid.",
+"Your storage is full, files can not be updated or synced anymore!" => "Ditt lagringsutrymme Ã¤r fullt, filer kan ej lÃ¤ngre laddas upp eller synkas!",
+"Your storage is almost full ({usedSpacePercent}%)" => "Ditt lagringsutrymme Ã¤r nÃ¤stan fullt ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "Din nedladdning fÃ¶rbereds. Det kan ta tid om det Ã¤r stora filer.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kunde inte ladda upp dina filer eftersom det antingen Ã¤r en mapp eller har 0 bytes.",
 "Upload Error" => "Uppladdningsfel",
 "Close" => "StÃ¤ng",
@@ -45,6 +50,7 @@
 "{count} folders" => "{count} mappar",
 "1 file" => "1 fil",
 "{count} files" => "{count} filer",
+"Upload" => "Ladda upp",
 "File handling" => "Filhantering",
 "Maximum upload size" => "Maximal storlek att ladda upp",
 "max. possible: " => "max. mÃ¶jligt:",
@@ -57,7 +63,6 @@
 "Text file" => "Textfil",
 "Folder" => "Mapp",
 "From link" => "FrÃ¥n lÃ¤nk",
-"Upload" => "Ladda upp",
 "Cancel upload" => "Avbryt uppladdning",
 "Nothing in here. Upload something!" => "Ingenting hÃ¤r. Ladda upp nÃ¥got!",
 "Download" => "Ladda ner",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index 16cab5cf96325828f0b0a6dc9ed228c84ac38443..52916fed7742cb376a199a027657fb6c33728ef7 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -20,7 +20,6 @@
 "unshared {files}" => "à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà®¾à®¤à®¤à¯  {à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯}",
 "deleted {files}" => "à®¨à¯€à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯  {à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯à®±à¯à®± à®ªà¯†à®¯à®°à¯,'\\', '/', '<', '>', ':', '\"', '|', '?' à®®à®±à¯à®±à¯à®®à¯ '*' à®†à®•à®¿à®¯à®© à®…à®©à¯à®®à®¤à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà®®à®¾à®Ÿà¯à®Ÿà®¾à®¤à¯.",
-"generating ZIP-file, it may take some time." => " ZIP à®•à¯‹à®ªà¯à®ªà¯ à®‰à®°à¯à®µà®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®¤à¯, à®‡à®¤à¯ à®šà®¿à®² à®¨à¯‡à®°à®®à¯ à®†à®•à®²à®¾à®®à¯.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "à®…à®Ÿà¯ˆà®µà¯ à®…à®²à¯à®²à®¤à¯ 0 bytes à® à®•à¯Šà®£à¯à®Ÿà¯à®³à¯à®³à®¤à®¾à®²à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à¯‡à®¾à®ªà¯à®ªà¯ˆ à®ªà®¤à®¿à®µà¯‡à®±à¯à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ",
 "Upload Error" => "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®µà®´à¯",
 "Close" => "à®®à¯‚à®Ÿà¯à®•",
@@ -39,6 +38,7 @@
 "{count} folders" => "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®•à®³à¯",
 "1 file" => "1 à®•à¯‹à®ªà¯à®ªà¯",
 "{count} files" => "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯",
+"Upload" => "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•",
 "File handling" => "à®•à¯‹à®ªà¯à®ªà¯ à®•à¯ˆà®¯à®¾à®³à¯à®¤à®²à¯",
 "Maximum upload size" => "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®•à¯à®•à¯‚à®Ÿà®¿à®¯ à®†à®•à®•à¯à®•à¯‚à®Ÿà®¿à®¯ à®…à®³à®µà¯ ",
 "max. possible: " => "à®†à®•à®•à¯ à®•à¯‚à®Ÿà®¿à®¯à®¤à¯:",
@@ -51,7 +51,6 @@
 "Text file" => "à®•à¯‹à®ªà¯à®ªà¯ à®‰à®°à¯ˆ",
 "Folder" => "à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ",
 "From link" => "à®‡à®£à¯ˆà®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯",
-"Upload" => "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•",
 "Cancel upload" => "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•",
 "Nothing in here. Upload something!" => "à®‡à®™à¯à®•à¯ à®’à®©à¯à®±à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®à®¤à®¾à®µà®¤à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•!",
 "Download" => "à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à¯à®•",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 3fda142a4e99ebc590bc34a45d72faaa548391d1..d7fcd82a9d125e16f6050625dc91f0b4ca89018f 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.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,8 @@
 "No file was uploaded" => "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸–à¸¹à¸à¸à¸±à¸žà¹‚à¸«à¸¥à¸”",
 "Missing a temporary folder" => "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£à¸Šà¸±à¹ˆà¸§à¸„à¸£à¸²à¸§à¹€à¸à¸´à¸”à¸à¸²à¸£à¸ªà¸¹à¸à¸«à¸²à¸¢",
 "Failed to write to disk" => "à¹€à¸‚à¸µà¸¢à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¹à¸œà¹ˆà¸™à¸”à¸´à¸ªà¸à¹Œà¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§",
+"Not enough storage available" => "à¹€à¸«à¸¥à¸·à¸à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¹€à¸žà¸µà¸¢à¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
+"Invalid directory." => "à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡",
 "Files" => "à¹„à¸Ÿà¸¥à¹Œ",
 "Unshare" => "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥",
 "Delete" => "à¸¥à¸š",
@@ -20,8 +25,12 @@
 "replaced {new_name} with {old_name}" => "à¹à¸—à¸™à¸—à¸µà¹ˆ {new_name} à¸”à¹‰à¸§à¸¢ {old_name} à¹à¸¥à¹‰à¸§",
 "unshared {files}" => "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¹à¸¥à¹‰à¸§ {files} à¹„à¸Ÿà¸¥à¹Œ",
 "deleted {files}" => "à¸¥à¸šà¹„à¸Ÿà¸¥à¹Œà¹à¸¥à¹‰à¸§ {files} à¹„à¸Ÿà¸¥à¹Œ",
+"'.' is an invalid file name." => "'.' à¹€à¸›à¹‡à¸™à¸Šà¸·à¹ˆà¸à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡",
+"File name cannot be empty." => "à¸Šà¸·à¹ˆà¸à¹„à¸Ÿà¸¥à¹Œà¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¹„à¸”à¹‰",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "à¸Šà¸·à¹ˆà¸à¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡, '\\', '/', '<', '>', ':', '\"', '|', '?' à¹à¸¥à¸° '*' à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰",
-"generating ZIP-file, it may take some time." => "à¸à¸³à¸¥à¸±à¸‡à¸ªà¸£à¹‰à¸²à¸‡à¹„à¸Ÿà¸¥à¹Œà¸šà¸µà¸šà¸à¸±à¸” ZIP à¸à¸²à¸ˆà¹ƒà¸Šà¹‰à¹€à¸§à¸¥à¸²à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ",
+"Your storage is full, files can not be updated or synced anymore!" => "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸•à¹‡à¸¡à¹à¸¥à¹‰à¸§ à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸±à¸žà¹€à¸”à¸—à¸«à¸£à¸·à¸à¸œà¸ªà¸²à¸™à¹„à¸Ÿà¸¥à¹Œà¸•à¹ˆà¸²à¸‡à¹†à¹„à¸”à¹‰à¸à¸µà¸à¸•à¹ˆà¸à¹„à¸›",
+"Your storage is almost full ({usedSpacePercent}%)" => "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„à¸¸à¸“à¹ƒà¸à¸¥à¹‰à¹€à¸•à¹‡à¸¡à¹à¸¥à¹‰à¸§ ({usedSpacePercent}%)",
+"Your download is being prepared. This might take some time if the files are big." => "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¸‚à¹‰à¸à¸¡à¸¹à¸¥ à¸«à¸²à¸à¹„à¸Ÿà¸¥à¹Œà¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆ à¸à¸²à¸ˆà¹ƒà¸Šà¹‰à¹€à¸§à¸¥à¸²à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ",
 "Unable to upload your file as it is a directory or has 0 bytes" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸”à¹‰ à¹€à¸™à¸·à¹ˆà¸à¸‡à¸ˆà¸²à¸à¹„à¸Ÿà¸¥à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¸«à¸£à¸·à¸à¸¡à¸µà¸‚à¸™à¸²à¸” 0 à¹„à¸šà¸•à¹Œ",
 "Upload Error" => "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”",
 "Close" => "à¸›à¸´à¸”",
@@ -31,6 +40,7 @@
 "Upload cancelled." => "à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸–à¸¹à¸à¸¢à¸à¹€à¸¥à¸´à¸",
 "File upload is in progress. Leaving the page now will cancel the upload." => "à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£ à¸à¸²à¸£à¸à¸à¸à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¸™à¸µà¹‰à¸ˆà¸°à¸—à¸³à¹ƒà¸«à¹‰à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸–à¸¹à¸à¸¢à¸à¹€à¸¥à¸´à¸",
 "URL cannot be empty." => "URL à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¹„à¸”à¹‰",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "à¸Šà¸·à¹ˆà¸à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡ à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ 'à¹à¸Šà¸£à¹Œ' à¸ªà¸‡à¸§à¸™à¹„à¸§à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š Owncloud à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
 "{count} files scanned" => "à¸ªà¹à¸à¸™à¹„à¸Ÿà¸¥à¹Œà¹à¸¥à¹‰à¸§ {count} à¹„à¸Ÿà¸¥à¹Œ",
 "error while scanning" => "à¸žà¸šà¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™à¹„à¸Ÿà¸¥à¹Œ",
 "Name" => "à¸Šà¸·à¹ˆà¸",
@@ -40,6 +50,7 @@
 "{count} folders" => "{count} à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ",
 "1 file" => "1 à¹„à¸Ÿà¸¥à¹Œ",
 "{count} files" => "{count} à¹„à¸Ÿà¸¥à¹Œ",
+"Upload" => "à¸à¸±à¸žà¹‚à¸«à¸¥à¸”",
 "File handling" => "à¸à¸²à¸£à¸ˆà¸±à¸”à¸à¸²à¹„à¸Ÿà¸¥à¹Œ",
 "Maximum upload size" => "à¸‚à¸™à¸²à¸”à¹„à¸Ÿà¸¥à¹Œà¸ªà¸¹à¸‡à¸ªà¸¸à¸”à¸—à¸µà¹ˆà¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰",
 "max. possible: " => "à¸ˆà¸³à¸™à¸§à¸™à¸ªà¸¹à¸‡à¸ªà¸¸à¸”à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¹„à¸”à¹‰: ",
@@ -52,7 +63,6 @@
 "Text file" => "à¹„à¸Ÿà¸¥à¹Œà¸‚à¹‰à¸à¸„à¸§à¸²à¸¡",
 "Folder" => "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£",
 "From link" => "à¸ˆà¸²à¸à¸¥à¸´à¸‡à¸à¹Œ",
-"Upload" => "à¸à¸±à¸žà¹‚à¸«à¸¥à¸”",
 "Cancel upload" => "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”",
 "Nothing in here. Upload something!" => "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹„à¸Ÿà¸¥à¹Œà¹ƒà¸”à¹†à¸à¸¢à¸¹à¹ˆà¸—à¸µà¹ˆà¸™à¸µà¹ˆ à¸à¸£à¸¸à¸“à¸²à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ!",
 "Download" => "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index b32da7de25e97bf1e60aec1a60a6225dc98ece34..2eba20fd0ae855e613d618ac2c221593d3451591 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Could not move %s - File with this name already exists" => "%s taÅŸÄ±namadÄ±. Bu isimde dosya zaten var.",
+"Could not move %s" => "%s taÅŸÄ±namadÄ±",
+"Unable to rename file" => "Dosya adÄ± deÄŸiÅŸtirilemedi",
 "No file was uploaded. Unknown error" => "Dosya yÃ¼klenmedi. Bilinmeyen hata",
 "There is no error, the file uploaded with success" => "Bir hata yok, dosya baÅŸarÄ±yla yÃ¼klendi",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasÄ±nda upload_max_filesize ile belirtilen dosya yÃ¼kleme sÄ±nÄ±rÄ± aÅŸÄ±ldÄ±.",
@@ -7,6 +10,7 @@
 "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Ä±",
+"Invalid directory." => "GeÃ§ersiz dizin.",
 "Files" => "Dosyalar",
 "Unshare" => "PaylaÅŸÄ±lmayan",
 "Delete" => "Sil",
@@ -20,8 +24,10 @@
 "replaced {new_name} with {old_name}" => "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi",
 "unshared {files}" => "paylaÅŸÄ±lmamÄ±ÅŸ {files}",
 "deleted {files}" => "silinen {files}",
+"'.' 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.",
-"generating ZIP-file, it may take some time." => "ZIP dosyasÄ± oluÅŸturuluyor, biraz sÃ¼rebilir.",
+"Your download is being prepared. This might take some time if the files are big." => "Ä°ndirmeniz hazÄ±rlanÄ±yor. Dosya bÃ¼yÃ¼k ise biraz zaman alabilir.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "DosyanÄ±zÄ±n boyutu 0 byte olduÄŸundan veya bir dizin olduÄŸundan yÃ¼klenemedi",
 "Upload Error" => "YÃ¼kleme hatasÄ±",
 "Close" => "Kapat",
@@ -31,6 +37,7 @@
 "Upload cancelled." => "YÃ¼kleme iptal edildi.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yÃ¼kleme iÅŸlemi sÃ¼rÃ¼yor. Åžimdi sayfadan ayrÄ±lÄ±rsanÄ±z iÅŸleminiz iptal olur.",
 "URL cannot be empty." => "URL boÅŸ olamaz.",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "GeÃ§ersiz dizin adÄ±. Shared isminin kullanÄ±mÄ± Owncloud tarafÄ±ndan rezerver edilmiÅŸtir.",
 "{count} files scanned" => "{count} dosya tarandÄ±",
 "error while scanning" => "tararamada hata oluÅŸdu",
 "Name" => "Ad",
@@ -40,6 +47,7 @@
 "{count} folders" => "{count} dizin",
 "1 file" => "1 dosya",
 "{count} files" => "{count} dosya",
+"Upload" => "YÃ¼kle",
 "File handling" => "Dosya taÅŸÄ±ma",
 "Maximum upload size" => "Maksimum yÃ¼kleme boyutu",
 "max. possible: " => "mÃ¼mkÃ¼n olan en fazla: ",
@@ -52,7 +60,6 @@
 "Text file" => "Metin dosyasÄ±",
 "Folder" => "KlasÃ¶r",
 "From link" => "BaÄŸlantÄ±dan",
-"Upload" => "YÃ¼kle",
 "Cancel upload" => "YÃ¼klemeyi iptal et",
 "Nothing in here. Upload something!" => "Burada hiÃ§bir ÅŸey yok. BirÅŸeyler yÃ¼kleyin!",
 "Download" => "Ä°ndir",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index eba48a41cb6416fc4248d1c345c7384f0653ce5b..aafa035ea09f7bfeacc790a3692fd72fce8888e8 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -21,7 +21,6 @@
 "unshared {files}" => "Ð½ÐµÐ¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾ {files}",
 "deleted {files}" => "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾ {files}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ÐÐµÐ²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼'Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' Ñ‚Ð° '*' Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ñ–.",
-"generating ZIP-file, it may take some time." => "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ZIP-Ñ„Ð°Ð¹Ð»Ñƒ, Ñ†Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑ‚Ð¸ Ð¿ÐµÐ²Ð½Ð¸Ð¹ Ñ‡Ð°Ñ.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð²Ð°Ñˆ Ñ„Ð°Ð¹Ð» Ñ‚Ð¾Ð¼Ñƒ, Ñ‰Ð¾ Ð²Ñ–Ð½ Ñ‚ÐµÐºÐ° Ð°Ð±Ð¾ Ñ„Ð°Ð¹Ð» Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ð¾Ð¼ 0 Ð±Ð°Ð¹Ñ‚",
 "Upload Error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ",
 "Close" => "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸",
@@ -40,6 +39,7 @@
 "{count} folders" => "{count} Ð¿Ð°Ð¿Ð¾Ðº",
 "1 file" => "1 Ñ„Ð°Ð¹Ð»",
 "{count} files" => "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð²",
+"Upload" => "Ð’Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸",
 "File handling" => "Ð Ð¾Ð±Ð¾Ñ‚Ð° Ð· Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸",
 "Maximum upload size" => "ÐœÐ°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ Ð²Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½ÑŒ",
 "max. possible: " => "Ð¼Ð°ÐºÑ.Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ:",
@@ -52,7 +52,6 @@
 "Text file" => "Ð¢ÐµÐºÑÑ‚Ð¾Ð²Ð¸Ð¹ Ñ„Ð°Ð¹Ð»",
 "Folder" => "ÐŸÐ°Ð¿ÐºÐ°",
 "From link" => "Ð— Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ",
-"Upload" => "Ð’Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸",
 "Cancel upload" => "ÐŸÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ",
 "Nothing in here. Upload something!" => "Ð¢ÑƒÑ‚ Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”. Ð’Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ñ‚Ðµ Ñ‰Ð¾-Ð½ÐµÐ±ÑƒÐ´ÑŒ!",
 "Download" => "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 7d5c52905025daf9c322e24d83bef94d88f66b26..ce4f3a7973f7a6f375775b6ad1490e0d96bfde92 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -20,7 +20,6 @@
 "unshared {files}" => "há»§y chia sáº½ {files}",
 "deleted {files}" => "Ä‘Ã£ xÃ³a {files}",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "TÃªn khÃ´ng há»£p lá»‡, '\\', '/', '<', '>', ':', '\"', '|', '?' vÃ  '*' thÃ¬ khÃ´ng Ä‘Æ°á»£c phÃ©p dÃ¹ng.",
-"generating ZIP-file, it may take some time." => "Táº¡o táºp tin ZIP, Ä‘iá»u nÃ y cÃ³ thá»ƒ lÃ m máº¥t má»™t chÃºt thá»i gian",
 "Unable to upload your file as it is a directory or has 0 bytes" => "KhÃ´ng thá»ƒ táº£i lÃªn táºp tin nÃ y do nÃ³ lÃ  má»™t thÆ° má»¥c hoáº·c kÃch thÆ°á»›c táºp tin báº±ng 0 byte",
 "Upload Error" => "Táº£i lÃªn lá»—i",
 "Close" => "ÄÃ³ng",
@@ -39,6 +38,7 @@
 "{count} folders" => "{count} thÆ° má»¥c",
 "1 file" => "1 táºp tin",
 "{count} files" => "{count} táºp tin",
+"Upload" => "Táº£i lÃªn",
 "File handling" => "Xá» lÃ½ táºp tin",
 "Maximum upload size" => "KÃch thÆ°á»›c tá»‘i Ä‘a ",
 "max. possible: " => "tá»‘i Ä‘a cho phÃ©p:",
@@ -51,7 +51,6 @@
 "Text file" => "Táºp tin vÄƒn báº£n",
 "Folder" => "ThÆ° má»¥c",
 "From link" => "Tá»« liÃªn káº¿t",
-"Upload" => "Táº£i lÃªn",
 "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 e60df8291a9828c9257dddd04659545550001cf8..ae1b603369a2965afbee1adbb69113668124c3f2 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -19,7 +19,6 @@
 "replaced {new_name} with {old_name}" => "å·²ç”¨ {old_name} æ›¿æ¢ {new_name}",
 "unshared {files}" => "æœªåˆ†äº«çš„ {files}",
 "deleted {files}" => "å·²åˆ é™¤çš„ {files}",
-"generating ZIP-file, it may take some time." => "æ£åœ¨ç”ŸæˆZIPæ–‡ä»¶,è¿™å¯èƒ½éœ€è¦ç‚¹æ—¶é—´",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ä¸èƒ½ä¸Šä¼ ä½ æŒ‡å®šçš„æ–‡ä»¶,å¯èƒ½å› ä¸ºå®ƒæ˜¯ä¸ªæ–‡ä»¶å¤¹æˆ–è€…å¤§å°ä¸º0",
 "Upload Error" => "ä¸Šä¼ é”™è¯¯",
 "Close" => "å…³é—",
@@ -38,6 +37,7 @@
 "{count} folders" => "{count} ä¸ªæ–‡ä»¶å¤¹",
 "1 file" => "1 ä¸ªæ–‡ä»¶",
 "{count} files" => "{count} ä¸ªæ–‡ä»¶",
+"Upload" => "ä¸Šä¼ ",
 "File handling" => "æ–‡ä»¶å¤„ç†ä¸",
 "Maximum upload size" => "æœ€å¤§ä¸Šä¼ å¤§å°",
 "max. possible: " => "æœ€å¤§å¯èƒ½",
@@ -50,7 +50,6 @@
 "Text file" => "æ–‡æœ¬æ–‡æ¡£",
 "Folder" => "æ–‡ä»¶å¤¹",
 "From link" => "æ¥è‡ªé“¾æŽ¥",
-"Upload" => "ä¸Šä¼ ",
 "Cancel upload" => "å–æ¶ˆä¸Šä¼ ",
 "Nothing in here. Upload something!" => "è¿™é‡Œæ²¡æœ‰ä¸œè¥¿.ä¸Šä¼ ç‚¹ä»€ä¹ˆ!",
 "Download" => "ä¸‹è½½",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 0b26a4b174f4f436a76329bc52a1df31db111b29..2e0f938dcd8aa335ee4043b0e63a93a25d99f9ee 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.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: " => "ä¸Šä¼ æ–‡ä»¶å¤§å°å·²è¶…è¿‡php.iniä¸upload_max_filesizeæ‰€è§„å®šçš„å€¼",
@@ -7,6 +10,7 @@
 "No file was uploaded" => "æ–‡ä»¶æ²¡æœ‰ä¸Šä¼ ",
 "Missing a temporary folder" => "ç¼ºå°‘ä¸´æ—¶ç›®å½•",
 "Failed to write to disk" => "å†™å…¥ç£ç›˜å¤±è´¥",
+"Invalid directory." => "æ— æ•ˆæ–‡ä»¶å¤¹ã€‚",
 "Files" => "æ–‡ä»¶",
 "Unshare" => "å–æ¶ˆåˆ†äº«",
 "Delete" => "åˆ é™¤",
@@ -20,8 +24,10 @@
 "replaced {new_name} with {old_name}" => "å·²å°† {old_name}æ›¿æ¢æˆ {new_name}",
 "unshared {files}" => "å–æ¶ˆäº†å…±äº« {files}",
 "deleted {files}" => "åˆ é™¤äº† {files}",
+"'.' is an invalid file name." => "'.' æ˜¯ä¸€ä¸ªæ— æ•ˆçš„æ–‡ä»¶åã€‚",
+"File name cannot be empty." => "æ–‡ä»¶åä¸èƒ½ä¸ºç©ºã€‚",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "æ— æ•ˆåç§°ï¼Œ'\\', '/', '<', '>', ':', '\"', '|', '?' å’Œ '*' ä¸è¢«å…è®¸ä½¿ç”¨ã€‚",
-"generating ZIP-file, it may take some time." => "æ£åœ¨ç”Ÿæˆ ZIP æ–‡ä»¶ï¼Œå¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´",
+"Your download is being prepared. This might take some time if the files are big." => "ä¸‹è½½æ£åœ¨å‡†å¤‡ä¸ã€‚å¦‚æžœæ–‡ä»¶è¾ƒå¤§å¯èƒ½ä¼šèŠ±è´¹ä¸€äº›æ—¶é—´ã€‚",
 "Unable to upload your file as it is a directory or has 0 bytes" => "æ— æ³•ä¸Šä¼ æ–‡ä»¶ï¼Œå› ä¸ºå®ƒæ˜¯ä¸€ä¸ªç›®å½•æˆ–è€…å¤§å°ä¸º 0 å—èŠ‚",
 "Upload Error" => "ä¸Šä¼ é”™è¯¯",
 "Close" => "å…³é—",
@@ -31,6 +37,7 @@
 "Upload cancelled." => "ä¸Šä¼ å·²å–æ¶ˆ",
 "File upload is in progress. Leaving the page now will cancel the upload." => "æ–‡ä»¶æ£åœ¨ä¸Šä¼ ä¸ã€‚çŽ°åœ¨ç¦»å¼€æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ åŠ¨ä½œè¢«å–æ¶ˆã€‚",
 "URL cannot be empty." => "URLä¸èƒ½ä¸ºç©º",
+"Invalid folder name. Usage of 'Shared' is reserved by Owncloud" => "æ— æ•ˆæ–‡ä»¶å¤¹åã€‚'å…±äº«' æ˜¯ Owncloud é¢„ç•™çš„æ–‡ä»¶å¤¹åã€‚",
 "{count} files scanned" => "{count} ä¸ªæ–‡ä»¶å·²æ‰«æã€‚",
 "error while scanning" => "æ‰«ææ—¶å‡ºé”™",
 "Name" => "åç§°",
@@ -40,6 +47,7 @@
 "{count} folders" => "{count} ä¸ªæ–‡ä»¶å¤¹",
 "1 file" => "1 ä¸ªæ–‡ä»¶",
 "{count} files" => "{count} ä¸ªæ–‡ä»¶",
+"Upload" => "ä¸Šä¼ ",
 "File handling" => "æ–‡ä»¶å¤„ç†",
 "Maximum upload size" => "æœ€å¤§ä¸Šä¼ å¤§å°",
 "max. possible: " => "æœ€å¤§å…è®¸: ",
@@ -52,7 +60,6 @@
 "Text file" => "æ–‡æœ¬æ–‡ä»¶",
 "Folder" => "æ–‡ä»¶å¤¹",
 "From link" => "æ¥è‡ªé“¾æŽ¥",
-"Upload" => "ä¸Šä¼ ",
 "Cancel upload" => "å–æ¶ˆä¸Šä¼ ",
 "Nothing in here. Upload something!" => "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼",
 "Download" => "ä¸‹è½½",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 7f0f44baca9bae34d0ac889af34092ab72d309ec..8d41a92735557e8de5ef6c49614022c536b7abd6 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -10,7 +10,6 @@
 "No file was uploaded" => "ç„¡å·²ä¸Šå‚³æª”æ¡ˆ",
 "Missing a temporary folder" => "éºå¤±æš«å˜è³‡æ–™å¤¾",
 "Failed to write to disk" => "å¯«å…¥ç¡¬ç¢Ÿå¤±æ•—",
-"Not enough space available" => "æ²’æœ‰è¶³å¤ çš„å¯ç”¨ç©ºé–“",
 "Invalid directory." => "ç„¡æ•ˆçš„è³‡æ–™å¤¾ã€‚",
 "Files" => "æª”æ¡ˆ",
 "Unshare" => "å–æ¶ˆå…±äº«",
@@ -28,7 +27,7 @@
 "'.' is an invalid file name." => "'.' æ˜¯ä¸åˆæ³•çš„æª”åã€‚",
 "File name cannot be empty." => "æª”åä¸èƒ½ç‚ºç©ºã€‚",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "æª”åä¸åˆæ³•ï¼Œä¸å…è¨± '\\', '/', '<', '>', ':', '\"', '|', '?' å’Œ '*' ã€‚",
-"generating ZIP-file, it may take some time." => "ç”¢ç”Ÿ ZIP å£“ç¸®æª”ï¼Œé€™å¯èƒ½éœ€è¦ä¸€æ®µæ™‚é–“ã€‚",
+"Your download is being prepared. This might take some time if the files are big." => "æ£åœ¨æº–å‚™æ‚¨çš„ä¸‹è¼‰ï¼Œè‹¥æ‚¨çš„æª”æ¡ˆè¼ƒå¤§ï¼Œå°‡æœƒéœ€è¦æ›´å¤šæ™‚é–“ã€‚",
 "Unable to upload your file as it is a directory or has 0 bytes" => "ç„¡æ³•ä¸Šå‚³æ‚¨çš„æª”æ¡ˆå› ç‚ºå®ƒå¯èƒ½æ˜¯ä¸€å€‹ç›®éŒ„æˆ–æª”æ¡ˆå¤§å°ç‚º0",
 "Upload Error" => "ä¸Šå‚³ç™¼ç”ŸéŒ¯èª¤",
 "Close" => "é—œé–‰",
@@ -48,6 +47,7 @@
 "{count} folders" => "{count} å€‹è³‡æ–™å¤¾",
 "1 file" => "1 å€‹æª”æ¡ˆ",
 "{count} files" => "{count} å€‹æª”æ¡ˆ",
+"Upload" => "ä¸Šå‚³",
 "File handling" => "æª”æ¡ˆè™•ç†",
 "Maximum upload size" => "æœ€å¤§ä¸Šå‚³æª”æ¡ˆå¤§å°",
 "max. possible: " => "æœ€å¤§å…è¨±ï¼š",
@@ -60,7 +60,6 @@
 "Text file" => "æ–‡å—æª”",
 "Folder" => "è³‡æ–™å¤¾",
 "From link" => "å¾žé€£çµ",
-"Upload" => "ä¸Šå‚³",
 "Cancel upload" => "å–æ¶ˆä¸Šå‚³",
 "Nothing in here. Upload something!" => "æ²’æœ‰ä»»ä½•æ±è¥¿ã€‚è«‹ä¸Šå‚³å…§å®¹ï¼",
 "Download" => "ä¸‹è¼‰",
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
new file mode 100644
index 0000000000000000000000000000000000000000..f2b1f142e9b81bd745393c19b22e3ee27783cda2
--- /dev/null
+++ b/apps/files/lib/helper.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace OCA\files\lib;
+
+class Helper
+{
+	public static function buildFileStorageStatistics($dir) {
+		$l = new \OC_L10N('files');
+		$maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir);
+		$maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize);
+		$maxHumanFilesize = $l->t('Upload') . ' max. ' . $maxHumanFilesize;
+
+		// information about storage capacities
+		$storageInfo = \OC_Helper::getStorageInfo();
+
+		return array('uploadMaxFilesize' => $maxUploadFilesize,
+					 'maxHumanFilesize'  => $maxHumanFilesize,
+					 'usedSpacePercent'  => (int)$storageInfo['relative']);
+	}
+}
diff --git a/apps/files/settings.php b/apps/files/settings.php
index 52ec9fd0fe3024c8119ec5cc39bfc8da2b682c41..ea730a5a727dbd6fea8b36214bae5ce6fd7250fb 100644
--- a/apps/files/settings.php
+++ b/apps/files/settings.php
@@ -21,10 +21,6 @@
 *
 */
 
-
-// Init owncloud
-
-
 // Check if we are a user
 OCP\User::checkLoggedIn();
 
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 2e0772443f2f3dbd8e124f82ceffe1e07197e124..b66b523ae38e2a7c5f4ce97880145ab33e51a5a5 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -50,7 +50,6 @@
 	<?php endif;?>
 	<input type="hidden" name="permissions" value="<?php echo $_['permissions']; ?>" id="permissions">
 </div>
-<div id='notification'></div>
 
 <?php if (isset($_['files']) and $_['isCreatable'] and count($_['files'])==0):?>
 	<div id="emptyfolder"><?php echo $l->t('Nothing in here. Upload something!')?></div>
@@ -115,3 +114,4 @@
 
 <!-- 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']; ?>" />
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index dfac43d1b12f66b5e78670de8b154746b0fe1157..f3f06d61d66af29b5e6a6c41c0e957cec8592de7 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -1,10 +1,4 @@
-<script type="text/javascript">
-<?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) :?>
-		var publicListView = true;
-<?php else: ?>
-		var publicListView = false;
-<?php endif; ?>
-</script>
+<input type="hidden" id="disableSharing" data-status="<?php echo $_['disableSharing']; ?>">
 
 <?php foreach($_['files'] as $file):
 	$simple_file_size = OCP\simple_file_size($file['size']);
diff --git a/apps/files_encryption/ajax/mode.php b/apps/files_encryption/ajax/mode.php
new file mode 100644
index 0000000000000000000000000000000000000000..64c5be944012aa7d447f0644740160ff296bf88b
--- /dev/null
+++ b/apps/files_encryption/ajax/mode.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Copyright (c) 2012, Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+use OCA\Encryption\Keymanager;
+
+OCP\JSON::checkAppEnabled('files_encryption');
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+
+$mode = $_POST['mode'];
+$changePasswd = false;
+$passwdChanged = false;
+
+if ( isset($_POST['newpasswd']) && isset($_POST['oldpasswd']) ) {
+	$oldpasswd = $_POST['oldpasswd'];
+	$newpasswd = $_POST['newpasswd'];
+	$changePasswd = true;
+	$passwdChanged = Keymanager::changePasswd($oldpasswd, $newpasswd);
+}
+
+$query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
+$result = $query->execute(array(\OCP\User::getUser()));
+
+if ($result->fetchRow()){
+	$query = OC_DB::prepare( 'UPDATE *PREFIX*encryption SET mode = ? WHERE uid = ?' );
+} else {
+	$query = OC_DB::prepare( 'INSERT INTO *PREFIX*encryption ( mode, uid ) VALUES( ?, ? )' );
+}
+
+if ( (!$changePasswd || $passwdChanged) && $query->execute(array($mode, \OCP\User::getUser())) ) {
+	OCP\JSON::success();
+} else {
+	OCP\JSON::error();
+}
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 2a30d0beb67af5316678d70e5c0e852b2c13a4f9..31b430d37a9fbc5c177abff55432689ba445d581 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -1,21 +1,37 @@
 <?php
 
-OC::$CLASSPATH['OC_Crypt'] = 'apps/files_encryption/lib/crypt.php';
-OC::$CLASSPATH['OC_CryptStream'] = 'apps/files_encryption/lib/cryptstream.php';
-OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.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_FileProxy::register(new OC_FileProxy_Encryption());
+OC_FileProxy::register( new OCA\Encryption\Proxy() );
 
-OCP\Util::connectHook('OC_User', 'post_login', 'OC_Crypt', 'loginListener');
+OCP\Util::connectHook( 'OC_User','post_login', 'OCA\Encryption\Hooks', 'login' );
+OCP\Util::connectHook( 'OC_Webdav_Properties', 'update', 'OCA\Encryption\Hooks', 'updateKeyfile' );
+OCP\Util::connectHook( 'OC_User','post_setPassword','OCA\Encryption\Hooks' ,'setPassphrase' );
 
-stream_wrapper_register('crypt', 'OC_CryptStream');
+stream_wrapper_register( 'crypt', 'OCA\Encryption\Stream' );
 
-// force the user to re-loggin if the encryption key isn't unlocked
-// (happens when a user is logged in before the encryption app is enabled)
-if ( ! isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {
+$session = new OCA\Encryption\Session();
+
+if ( 
+! $session->getPrivateKey( \OCP\USER::getUser() )
+&& OCP\User::isLoggedIn() 
+&& OCA\Encryption\Crypt::mode() == 'server' 
+) {
+
+	// Force the user to re-log in if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
 	OCP\User::logout();
-	header("Location: ".OC::$WEBROOT.'/');
+	
+	header( "Location: " . OC::$WEBROOT.'/' );
+	
 	exit();
+
 }
 
-OCP\App::registerAdmin('files_encryption', 'settings');
\ No newline at end of file
+OCP\App::registerAdmin( 'files_encryption', 'settings');
+OCP\App::registerPersonal( 'files_encryption', 'settings-personal' );
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/database.xml b/apps/files_encryption/appinfo/database.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d294c35d63d0052e14cc188cebb3603822113aac
--- /dev/null
+++ b/apps/files_encryption/appinfo/database.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<database>
+	 <name>*dbname*</name>
+	 <create>true</create>
+	 <overwrite>false</overwrite>
+	 <charset>utf8</charset>
+	 <table>
+		<name>*dbprefix*encryption</name>
+		<declaration>
+			<field>
+				<name>uid</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+			<field>
+				<name>mode</name>
+				<type>text</type>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+		</declaration>
+	</table>
+</database>
\ No newline at end of file
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 48a28fde78a9c42a8862834cb948fb5e52df11ae..39ea155488f4f1944a152cc4b85b49bd0394b5fb 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,10 +2,10 @@
 <info>
 	<id>files_encryption</id>
 	<name>Encryption</name>
-	<description>Server side encryption of files. DEPRECATED. This app is no longer supported and will be replaced with an improved version in ownCloud 5. Only enable this features if you want to read old encrypted data. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
+	<description>Server side encryption of files. Warning: You will lose your data if you enable this App and forget your password. Encryption is not yet compatible with LDAP.</description>
 	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4.9</require>
+	<author>Sam Tuke</author>
+	<require>4</require>
 	<shipped>true</shipped>
 	<types>
 		<filesystem/>
diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version
index 2f4536184bcac31936bd15a5f9cf931dd526c022..7dff5b8921122a487162febe3c8e32effb7acb35 100644
--- a/apps/files_encryption/appinfo/version
+++ b/apps/files_encryption/appinfo/version
@@ -1 +1 @@
-0.2
\ No newline at end of file
+0.2.1
\ No newline at end of file
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
new file mode 100644
index 0000000000000000000000000000000000000000..c2f97247835331d63f189acb864f43616a147d3c
--- /dev/null
+++ b/apps/files_encryption/hooks/hooks.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Sam Tuke
+ * @copyright 2012 Sam Tuke samtuke@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * Class for hook specific logic
+ */
+
+class Hooks {
+
+	# TODO: use passphrase for encrypting private key that is separate to the login password
+
+	/**
+	 * @brief Startup encryption backend upon user login
+	 * @note This method should never be called for users using client side encryption
+	 */
+	public static function login( $params ) {
+	
+// 		if ( Crypt::mode( $params['uid'] ) == 'server' ) {
+			
+			# TODO: use lots of dependency injection here
+		
+			$view = new \OC_FilesystemView( '/' );
+
+			$util = new Util( $view, $params['uid'] );
+			
+			if ( ! $util->ready() ) {
+				
+				\OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started' , \OC_Log::DEBUG );
+				
+				return $util->setupServerSide( $params['password'] );
+
+			}
+		
+			\OC_FileProxy::$enabled = false;
+			
+			$encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );
+			
+			\OC_FileProxy::$enabled = true;
+			
+			# TODO: dont manually encrypt the private keyfile - use the config options of openssl_pkey_export instead for better mobile compatibility
+			
+			$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
+			
+			$session = new Session();
+			
+			$session->setPrivateKey( $privateKey, $params['uid'] );
+			
+			$view1 = new \OC_FilesystemView( '/' . $params['uid'] );
+			
+			// Set legacy encryption key if it exists, to support 
+			// depreciated encryption system
+			if ( 
+			$view1->file_exists( 'encryption.key' )
+			&& $legacyKey = $view1->file_get_contents( 'encryption.key' ) 
+			) {
+				
+				$_SESSION['legacyenckey'] = Crypt::legacyDecrypt( $legacyKey, $params['password'] );
+			
+			}
+// 		}
+
+		return true;
+
+	}
+	
+	/**
+	 * @brief Change a user's encryption passphrase
+	 * @param array $params keys: uid, password
+	 */
+	public static function setPassphrase( $params ) {
+	
+		// Only attempt to change passphrase if server-side encryption
+		// is in use (client-side encryption does not have access to 
+		// the necessary keys)
+		if ( Crypt::mode() == 'server' ) {
+			
+			// Get existing decrypted private key
+			$privateKey = $_SESSION['privateKey'];
+			
+			// Encrypt private key with new user pwd as passphrase
+			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $privateKey, $params['password'] );
+			
+			// Save private key
+			Keymanager::setPrivateKey( $encryptedPrivateKey );
+			
+			# NOTE: Session does not need to be updated as the 
+			# private key has not changed, only the passphrase 
+			# used to decrypt it has changed
+			
+		}
+	
+	}
+	
+	/**
+	 * @brief update the encryption key of the file uploaded by the client
+	 */
+	public static function updateKeyfile( $params ) {
+	
+		if ( Crypt::mode() == 'client' ) {
+			
+			if ( isset( $params['properties']['key'] ) ) {
+				
+				Keymanager::setFileKey( $params['path'], $params['properties']['key'] );
+			
+			} else {
+				
+				\OC_Log::write( 
+					'Encryption library', "Client side encryption is enabled but the client doesn't provide a encryption key for the file!"
+					, \OC_Log::ERROR 
+				);
+				
+				error_log( "Client side encryption is enabled but the client doesn't provide an encryption key for the file!" );
+				
+			}
+			
+		}
+		
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings-personal.js b/apps/files_encryption/js/settings-personal.js
new file mode 100644
index 0000000000000000000000000000000000000000..1a53e99d2b4da326c10710ac2cb14617e3c68070
--- /dev/null
+++ b/apps/files_encryption/js/settings-personal.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2012, Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+$(document).ready(function(){
+	$('input[name=encryption_mode]').change(function(){
+		var prevmode = document.getElementById('prev_encryption_mode').value
+		var  client=$('input[value="client"]:checked').val()
+			 ,server=$('input[value="server"]:checked').val()
+			 ,user=$('input[value="user"]:checked').val()
+			 ,none=$('input[value="none"]:checked').val()
+		if (client) {
+			$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'client' });
+			if (prevmode == 'server') {
+				OC.dialogs.info(t('encryption', 'Please switch to your ownCloud client and change your encryption password to complete the conversion.'), t('encryption', 'switched to client side encryption'));
+			}
+		} else if (server) {
+			if (prevmode == 'client') {
+				OC.dialogs.form([{text:'Login password', name:'newpasswd', type:'password'},{text:'Encryption password used on the client', name:'oldpasswd', type:'password'}],t('encryption', 'Change encryption password to login password'), function(data) {
+					$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server', newpasswd: data[0].value, oldpasswd: data[1].value }, function(result) {
+						if (result.status != 'success') {
+							document.getElementById(prevmode+'_encryption').checked = true;
+							OC.dialogs.alert(t('encryption', 'Please check your passwords and try again.'), t('encryption', 'Could not change your file encryption password to your login password'))
+						} else {
+							console.log("alles super");
+						}
+					}, true);
+				});
+			} else {
+				$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'server' });
+			}
+		} else {
+			$.post(OC.filePath('files_encryption', 'ajax', 'mode.php'), { mode: 'none' });
+		}
+	})
+})
\ No newline at end of file
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 6fc70eba7f6af8c45592b2bd511b773d37755363..60563bde859cd59683bbb7706fb4c0992b3523f9 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -11,14 +11,36 @@ $(document).ready(function(){
 		onuncheck:blackListChange,
 		createText:'...',
 	});
-
+	
 	function blackListChange(){
 		var blackList=$('#encryption_blacklist').val().join(',');
 		OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
 	}
 
-	$('#enable_encryption').change(function(){
-		var checked=$('#enable_encryption').is(':checked');
-		OC.AppConfig.setValue('files_encryption','enable_encryption',(checked)?'true':'false');
-	});
-});
+	//TODO: Handle switch between client and server side encryption
+	$('input[name=encryption_mode]').change(function(){
+		var  client=$('input[value="client"]:checked').val()
+			 ,server=$('input[value="server"]:checked').val()
+			 ,user=$('input[value="user"]:checked').val()
+			 ,none=$('input[value="none"]:checked').val()
+			 ,disable=false
+		if (client) {
+			OC.AppConfig.setValue('files_encryption','mode','client');
+			disable = true;
+		} else if (server) {
+			OC.AppConfig.setValue('files_encryption','mode','server');
+			disable = true;
+		} else if (user) {
+			OC.AppConfig.setValue('files_encryption','mode','user');
+			disable = true;
+		} else {
+			OC.AppConfig.setValue('files_encryption','mode','none');
+		}
+		if (disable) {
+			document.getElementById('server_encryption').disabled = true;
+			document.getElementById('client_encryption').disabled = true;
+			document.getElementById('user_encryption').disabled = true;
+			document.getElementById('none_encryption').disabled = true;
+		}
+	})
+})
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 756a9d72799163ead8949eaaa973d848794d5a8a..f08585e485f18faf6d35e4b14b7ce831b1f88bbf 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ø§Ù„ØªØ´ÙÙŠØ±",
 "Exclude the following file types from encryption" => "Ø§Ø³ØªØ¨Ø¹Ø¯ Ø£Ù†ÙˆØ§Ø¹ Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„ØªØ§Ù„ÙŠØ© Ù…Ù† Ø§Ù„ØªØ´ÙÙŠØ±",
-"None" => "Ù„Ø§ Ø´ÙŠØ¡",
-"Enable Encryption" => "ØªÙØ¹ÙŠÙ„ Ø§Ù„ØªØ´ÙÙŠØ±"
+"None" => "Ù„Ø§ Ø´ÙŠØ¡"
 );
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index cb1613ef37551e40c443be61f8d549644a5897db..4ceee127af1be0674c4544f534712f0574cb637b 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "ÐšÑ€Ð¸Ð¿Ñ‚Ð¸Ñ€Ð°Ð½Ðµ",
-"Enable Encryption" => "Ð’ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÑ€Ð¸Ð¿Ñ‚Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾",
-"None" => "ÐÑÐ¼Ð°",
-"Exclude the following file types from encryption" => "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸ Ñ‚Ð¸Ð¿Ð¾Ð²Ðµ Ð¾Ñ‚ ÐºÑ€Ð¸Ð¿Ñ‚Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾"
+"Exclude the following file types from encryption" => "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸ Ñ‚Ð¸Ð¿Ð¾Ð²Ðµ Ð¾Ñ‚ ÐºÑ€Ð¸Ð¿Ñ‚Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾",
+"None" => "ÐÑÐ¼Ð°"
 );
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index c8f041d7622f3826fe07e5b88f47c1465314f584..29c486b8ca06e3d3db8609ba2ace6e8085833964 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "à¦¸à¦‚à¦•à§‡à¦¤à¦¾à§Ÿà¦¨",
-"Enable Encryption" => "à¦¸à¦‚à¦•à§‡à¦¤à¦¾à§Ÿà¦¨ à¦¸à¦•à§à¦°à¦¿à§Ÿ à¦•à¦°",
-"None" => "à¦•à§‹à¦¨à¦Ÿà¦¿à¦‡ à¦¨à§Ÿ",
-"Exclude the following file types from encryption" => "à¦¸à¦‚à¦•à§‡à¦¤à¦¾à§Ÿà¦¨ à¦¥à§‡à¦•à§‡ à¦¨à¦¿à¦®à§à¦¨à§‹à¦•à§à¦¤ à¦§à¦°à¦£à¦¸à¦®à§‚à¦¹ à¦¬à¦¾à¦¦ à¦¦à¦¾à¦“"
+"Exclude the following file types from encryption" => "à¦¸à¦‚à¦•à§‡à¦¤à¦¾à§Ÿà¦¨ à¦¥à§‡à¦•à§‡ à¦¨à¦¿à¦®à§à¦¨à§‹à¦•à§à¦¤ à¦§à¦°à¦£à¦¸à¦®à§‚à¦¹ à¦¬à¦¾à¦¦ à¦¦à¦¾à¦“",
+"None" => "à¦•à§‹à¦¨à¦Ÿà¦¿à¦‡ à¦¨à§Ÿ"
 );
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index 8e087b34620b2c5415b72acfa78acc7e890fa591..56c81e747f7c823ae8b7e54d1040fc36196ba926 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Connecteu-vos al client ownCloud i canvieu la contrasenya d'encriptaciÃ³ per completar la conversiÃ³.",
+"switched to client side encryption" => "s'ha commutat a l'encriptaciÃ³ per part del client",
+"Change encryption password to login password" => "Canvia la contrasenya d'encriptaciÃ³ per la d'accÃ©s",
+"Please check your passwords and try again." => "Comproveu les contrasenyes i proveu-ho de nou.",
+"Could not change your file encryption password to your login password" => "No s'ha pogut canviar la contrasenya d'encriptaciÃ³ de fitxers per la d'accÃ©s",
+"Choose encryption mode:" => "Escolliu el mode d'encriptaciÃ³:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "EncriptaciÃ³ per part del client (mÃ©s segura perÃ² fa impossible l'accÃ©s a les dades des de la interfÃcie web)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "EncriptaciÃ³ per part del servidor (permet accedir als fitxers des de la interfÃcie web i des del client d'escriptori)",
+"None (no encryption at all)" => "Cap (sense encriptaciÃ³)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Important: quan seleccioneu un mode d'encriptaciÃ³ no hi ha manera de canviar-lo de nou",
+"User specific (let the user decide)" => "EspecÃfic per usuari (permet que l'usuari ho decideixi)",
 "Encryption" => "Encriptatge",
 "Exclude the following file types from encryption" => "Exclou els tipus de fitxers segÃ¼ents de l'encriptatge",
-"None" => "Cap",
-"Enable Encryption" => "Activa l'encriptatge"
+"None" => "Cap"
 );
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 9be2be98092114f5107515a396b958c5ebb4c41d..5948a9b82e802b9c5ac8ccbcd382b3f80fcb18a2 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "ProsÃm pÅ™ejdÄ›te na svÃ©ho klienta ownCloud a nastavte Å¡ifrovacÃ heslo pro dokonÄenÃ konverze.",
+"switched to client side encryption" => "pÅ™epnuto na Å¡ifrovÃ¡nÃ na stranÄ› klienta",
+"Change encryption password to login password" => "ZmÄ›nit Å¡ifrovacÃ heslo na pÅ™ihlaÅ¡ovacÃ",
+"Please check your passwords and try again." => "Zkontrolujte, prosÃm, svÃ© heslo a zkuste to znovu.",
+"Could not change your file encryption password to your login password" => "Nelze zmÄ›nit Å¡ifrovacÃ heslo na pÅ™ihlaÅ¡ovacÃ.",
+"Choose encryption mode:" => "Vyberte reÅ¾im Å¡ifrovÃ¡nÃ:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Å ifrovÃ¡nÃ na stranÄ› klienta (nejbezpeÄnÄ›jÅ¡Ã ale neumoÅ¾Åˆuje vÃ¡m pÅ™istupovat k souborÅ¯m z webovÃ©ho rozhranÃ)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Å ifrovÃ¡nÃ na stranÄ› serveru (umoÅ¾Åˆuje vÃ¡m pÅ™istupovat k souborÅ¯m pomocÃ webovÃ©ho rozhranÃ i aplikacÃ)",
+"None (no encryption at all)" => "Å½Ã¡dnÃ½ (vÅ¯bec Å¾Ã¡dnÃ© Å¡ifrovÃ¡nÃ)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "DÅ¯leÅ¾itÃ©: jak si jednou vyberete reÅ¾im Å¡ifrovÃ¡nÃ nelze jej opÄ›tovnÄ› zmÄ›nit",
+"User specific (let the user decide)" => "DefinovÃ¡n uÅ¾ivatelem (umoÅ¾nÃ uÅ¾ivateli si vybrat)",
 "Encryption" => "Å ifrovÃ¡nÃ",
 "Exclude the following file types from encryption" => "PÅ™i Å¡ifrovÃ¡nÃ vynechat nÃ¡sledujÃcÃ typy souborÅ¯",
-"None" => "Å½Ã¡dnÃ©",
-"Enable Encryption" => "Povolit Å¡ifrovÃ¡nÃ"
+"None" => "Å½Ã¡dnÃ©"
 );
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index 144c9f97084f6768bda1bce92d4515b50d05b1dd..d65963f46b249fa5fa5ed6818fe72defd76af870 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Skift venligst til din ownCloud-klient og skift krypteringskoden for at fuldfÃ¸re konverteringen.",
+"switched to client side encryption" => "skiftet til kryptering pÃ¥ klientsiden",
+"Change encryption password to login password" => "Udskift krypteringskode til login-adgangskode",
+"Please check your passwords and try again." => "Check adgangskoder og forsÃ¸g igen.",
+"Could not change your file encryption password to your login password" => "Kunne ikke udskifte krypteringskode med login-adgangskode",
+"Choose encryption mode:" => "VÃ¦lg krypteringsform:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Kryptering pÃ¥ klientsiden (mere sikker, men udelukker adgang til dataene fra webinterfacet)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Kryptering pÃ¥ serversiden (gÃ¸r det muligt at tilgÃ¥ filer fra webinterfacet sÃ¥vel som desktopklienten)",
+"None (no encryption at all)" => "Ingen (ingen kryptering)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Vigtigt: NÃ¥r der er valgt krypteringsform, kan det ikke Ã¦ndres tilbage igen.",
+"User specific (let the user decide)" => "Brugerspecifik (lad brugeren bestemme)",
 "Encryption" => "Kryptering",
 "Exclude the following file types from encryption" => "Ekskluder fÃ¸lgende filtyper fra kryptering",
-"None" => "Ingen",
-"Enable Encryption" => "AktivÃ©r kryptering"
+"None" => "Ingen"
 );
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index d486a82322bb7f4c1e6f73ce9976d2ada7d60747..e187f72ab50f44aa77b299c377f559fcd8c92576 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Bitte wechseln Sie nun zum ownCloud Client und Ã¤ndern Sie ihr VerschlÃ¼sselungspasswort um die Konvertierung abzuschlieÃŸen.",
+"switched to client side encryption" => "Zur Clientseitigen VerschlÃ¼sselung gewechselt",
+"Change encryption password to login password" => "Ã„ndern des VerschlÃ¼sselungspasswortes zum Anmeldepasswort",
+"Please check your passwords and try again." => "Bitte Ã¼berprÃ¼fen sie Ihr Passwort und versuchen Sie es erneut.",
+"Could not change your file encryption password to your login password" => "Ihr VerschlÃ¼sselungspasswort konnte nicht als Anmeldepasswort gesetzt werden.",
+"Choose encryption mode:" => "WÃ¤hlen Sie die VerschlÃ¼sselungsart:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Clientseitige VerschlÃ¼sselung (am sichersten, aber macht es unmÃ¶glich auf ihre Daten Ã¼ber das Webinterface zuzugreifen)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Serverseitige VerschlÃ¼sselung (erlaubt es ihnen auf ihre Daten Ã¼ber das Webinterface und den Desktop-Client zuzugreifen)",
+"None (no encryption at all)" => "Keine (ohne VerschlÃ¼sselung)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Wichtig: Sobald sie eine VerschlÃ¼sselungsmethode gewÃ¤hlt haben, kÃ¶nnen Sie diese nicht Ã¤ndern!",
+"User specific (let the user decide)" => "Benutzerspezifisch (der Benutzer kann entscheiden)",
 "Encryption" => "VerschlÃ¼sselung",
 "Exclude the following file types from encryption" => "Die folgenden Dateitypen von der VerschlÃ¼sselung ausnehmen",
-"None" => "Keine",
-"Enable Encryption" => "VerschlÃ¼sselung aktivieren"
+"None" => "Keine"
 );
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index d486a82322bb7f4c1e6f73ce9976d2ada7d60747..be4369ebf09076787707742829c9ebcd8dc41c75 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Bitte wechseln Sie nun zum ownCloud Client und Ã¤ndern Sie ihr VerschlÃ¼sselungspasswort um die Konvertierung abzuschlieÃŸen.",
+"switched to client side encryption" => "Zur Clientseitigen VerschlÃ¼sselung gewechselt",
+"Change encryption password to login password" => "Ã„ndern des VerschlÃ¼sselungspasswortes zum Anmeldepasswort",
+"Please check your passwords and try again." => "Bitte Ã¼berprÃ¼fen sie Ihr Passwort und versuchen Sie es erneut.",
+"Could not change your file encryption password to your login password" => "Ihr VerschlÃ¼sselungspasswort konnte nicht als Anmeldepasswort gesetzt werden.",
+"Choose encryption mode:" => "WÃ¤hlen Sie die VerschlÃ¼sselungsmethode:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Clientseitige VerschlÃ¼sselung (am sichersten, aber macht es unmÃ¶glich auf ihre Daten Ã¼ber das Webinterface zuzugreifen)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Serverseitige VerschlÃ¼sselung (erlaubt es ihnen auf ihre Daten Ã¼ber das Webinterface und den Desktop-Client zuzugreifen)",
+"None (no encryption at all)" => "Keine (ohne VerschlÃ¼sselung)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Wichtig: Sobald sie eine VerschlÃ¼sselungsmethode gewÃ¤hlt haben, kÃ¶nnen Sie diese nicht Ã¤ndern!",
+"User specific (let the user decide)" => "Benutzerspezifisch (der Benutzer kann entscheiden)",
 "Encryption" => "VerschlÃ¼sselung",
 "Exclude the following file types from encryption" => "Die folgenden Dateitypen von der VerschlÃ¼sselung ausnehmen",
-"None" => "Keine",
-"Enable Encryption" => "VerschlÃ¼sselung aktivieren"
+"None" => "Keine"
 );
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index 40a7c6a367253dcdbd759d67f4b8972a4b25d1ec..50b812c82dffe0647cb83db5cdcf47c045e8fccf 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,6 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Change encryption password to login password" => "Î‘Î»Î»Î±Î³Î® ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚ ÏƒÏ„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÎµÎ¹ÏƒÏŒÎ´Î¿Ï… ",
+"Please check your passwords and try again." => "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ»ÎÎ³Î¾Ï„Îµ Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÎ±Ï‚ ÎºÎ±Î¹ Ï€ÏÎ¿ÏƒÏ€Î±Î¸Î®ÏƒÏ„Îµ Î¾Î±Î½Î¬.",
+"Could not change your file encryption password to your login password" => "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î±Î»Î»Î±Î³Î®Ï‚ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÏ„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÎµÎ¹ÏƒÏŒÎ´Î¿Ï… ÏƒÎ±Ï‚",
+"Choose encryption mode:" => "Î•Ï€Î¹Î»Î¿Î³Î® ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚:",
 "Encryption" => "ÎšÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·",
 "Exclude the following file types from encryption" => "Î•Î¾Î±Î¯ÏÎµÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï„ÏÏ€Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î±Ï€ÏŒ Ï„Î·Î½ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·",
-"None" => "ÎšÎ±Î¼Î¯Î±",
-"Enable Encryption" => "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎšÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚"
+"None" => "ÎšÎ±Î¼Î¯Î±"
 );
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index af3c9ae98e4dcbf39f846429d0d4cddfd5406097..c6f82dcb8a02a4fcd85bd40d18ecc5893d4db644 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Äˆifrado",
 "Exclude the following file types from encryption" => "Malinkluzivigi la jenajn dosiertipojn el Ä‰ifrado",
-"None" => "Nenio",
-"Enable Encryption" => "Kapabligi Ä‰ifradon"
+"None" => "Nenio"
 );
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index b7e7601b35f8c5e609ad837d23b0055f6cecd1e8..6a6f5510db66fa4515f8046f6b22a8588b6e31e7 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,6 +1,10 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Por favor, cambie su cliente de ownCloud y cambie su clave de cifrado para completar la conversiÃ³n.",
+"switched to client side encryption" => "Cambiar a encriptaciÃ³n en lado cliente",
+"Change encryption password to login password" => "Cambie la clave de cifrado para ingresar su contraseÃ±a",
+"Please check your passwords and try again." => "Por favor revise su contraseÃ±a e intentelo de nuevo.",
+"Choose encryption mode:" => "Elegir el modo de encriptado:",
 "Encryption" => "Cifrado",
 "Exclude the following file types from encryption" => "Excluir del cifrado los siguientes tipos de archivo",
-"None" => "Ninguno",
-"Enable Encryption" => "Habilitar cifrado"
+"None" => "Ninguno"
 );
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index a15c37e730eae89fb61754432cfefe8bc65331cc..31898f50fded15d743ad82281a287b4b8d67dfa7 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "EncriptaciÃ³n",
 "Exclude the following file types from encryption" => "Exceptuar de la encriptaciÃ³n los siguientes tipos de archivo",
-"None" => "Ninguno",
-"Enable Encryption" => "Habilitar encriptaciÃ³n"
+"None" => "Ninguno"
 );
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index a7cd9395bf070721e490495b12cc1dfbf7b109b9..0c0ef2311457a00b792144ab61161441638a8252 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "KrÃ¼pteerimine",
 "Exclude the following file types from encryption" => "JÃ¤rgnevaid failitÃ¼Ã¼pe Ã¤ra krÃ¼pteeri",
-"None" => "Pole",
-"Enable Encryption" => "Luba krÃ¼pteerimine"
+"None" => "Pole"
 );
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 57b6a4927bfa6b6ad50e7f1bdd94826ff0f38586..e7372937e4a18478947225e437ef1502f56d5dae 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,6 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Please check your passwords and try again." => "Mesedez egiaztatu zure pasahitza eta saia zaitez berriro:",
+"Choose encryption mode:" => "Hautatu enkriptazio modua:",
+"None (no encryption at all)" => "Bat ere ez (enkriptaziorik gabe)",
+"User specific (let the user decide)" => "Erabiltzaileak zehaztuta (utzi erabiltzaileari hautatzen)",
 "Encryption" => "Enkriptazioa",
 "Exclude the following file types from encryption" => "Ez enkriptatu hurrengo fitxategi motak",
-"None" => "Bat ere ez",
-"Enable Encryption" => "Gaitu enkriptazioa"
+"None" => "Bat ere ez"
 );
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 01582e48e60e4d685b2db79aa42e041585ffbdce..0cdee74f5a9615f1f64abd7aafff64bfc439d47e 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ",
 "Exclude the following file types from encryption" => "Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ† ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø²ÛŒØ± Ø¨Ø±Ø§ÛŒ Ø±Ù…Ø² Ú¯Ø°Ø§Ø±ÛŒ",
-"None" => "Ù‡ÛŒÚ†â€ŒÚ©Ø¯Ø§Ù…",
-"Enable Encryption" => "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ"
+"None" => "Ù‡ÛŒÚ†â€ŒÚ©Ø¯Ø§Ù…"
 );
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 5796499a26ceb3cb6017378318f0b9ab268115fb..433ae890ef60d37738ac63ef54e5055c155e659d 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Salaus",
 "Exclude the following file types from encryption" => "JÃ¤tÃ¤ seuraavat tiedostotyypit salaamatta",
-"None" => "Ei mitÃ¤Ã¤n",
-"Enable Encryption" => "KÃ¤ytÃ¤ salausta"
+"None" => "Ei mitÃ¤Ã¤n"
 );
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index c9367d1a31209bb806fec920731bc4b0169c4262..41e37134d4e68ebd3930a2d16f315f8c755894ea 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Veuillez vous connecter depuis votre client de synchronisation ownCloud et changer votre mot de passe de chiffrement pour finaliser la conversion.",
+"switched to client side encryption" => "Mode de chiffrement changÃ© en chiffrement cÃ´tÃ© client",
+"Change encryption password to login password" => "Convertir le mot de passe de chiffrement en mot de passe de connexion",
+"Please check your passwords and try again." => "Veuillez vÃ©rifier vos mots de passe et rÃ©essayer.",
+"Could not change your file encryption password to your login password" => "Impossible de convertir votre mot de passe de chiffrement en mot de passe de connexion",
+"Choose encryption mode:" => "Choix du type de chiffrement :",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Chiffrement cÃ´tÃ© client (plus sÃ©curisÃ©, mais ne permet pas l'accÃ¨s Ã  vos donnÃ©es depuis l'interface web)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Chiffrement cÃ´tÃ© serveur (vous permet d'accÃ©der Ã  vos fichiers depuis l'interface web et depuis le client de synchronisation)",
+"None (no encryption at all)" => "Aucun (pas de chiffrement)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Important : Une fois le mode de chiffrement choisi, il est impossible de revenir en arriÃ¨re",
+"User specific (let the user decide)" => "Propre Ã  l'utilisateur (laisse le choix Ã  l'utilisateur)",
 "Encryption" => "Chiffrement",
 "Exclude the following file types from encryption" => "Ne pas chiffrer les fichiers dont les types sont les suivants",
-"None" => "Aucun",
-"Enable Encryption" => "Activer le chiffrement"
+"None" => "Aucun"
 );
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 91d155ccad36424efee50b05203a6a5bd6fae413..42fcfce1cc082b118ca1c0f8cc48e84bb9fc17c1 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Cifrado",
 "Exclude the following file types from encryption" => "ExcluÃr os seguintes tipos de ficheiro do cifrado",
-"None" => "Nada",
-"Enable Encryption" => "Activar o cifrado"
+"None" => "Nada"
 );
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index 0332d59520a75166bfb9cf1c749d2bb6c50f8c64..9adb6d2b92a782e6576facf5393158dc8eeafbee 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "×”×¦×¤× ×”",
-"Enable Encryption" => "×”×¤×¢×œ ×”×¦×¤× ×”",
-"None" => "×›×œ×•×",
-"Exclude the following file types from encryption" => "×”×•×¦× ××ª ×¡×•×’×™ ×”×§×‘×¦×™× ×”×‘××™× ×ž×”×¦×¤× ×”"
+"Exclude the following file types from encryption" => "×”×•×¦× ××ª ×¡×•×’×™ ×”×§×‘×¦×™× ×”×‘××™× ×ž×”×¦×¤× ×”",
+"None" => "×›×œ×•×"
 );
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 8ea0f731736ac5d37f356e2d991423c8ac8bdeff..e32de01f9731676772ed74746cabde1aa9bdc45e 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "KÃ©rjÃ¼k, hogy vÃ¡ltson Ã¡t az ownCloud kliensÃ©re, Ã©s vÃ¡ltoztassa meg a titkosÃtÃ¡si jelszÃ³t az Ã¡talakÃtÃ¡s befejezÃ©sÃ©hez.",
+"switched to client side encryption" => "Ã¡tvÃ¡ltva a kliens oldalai titkosÃtÃ¡sra",
+"Change encryption password to login password" => "TitkosÃtÃ¡si jelszÃ³ mÃ³dosÃtÃ¡sa a bejelentkezÃ©si jelszÃ³ra",
+"Please check your passwords and try again." => "KÃ©rjÃ¼k, ellenÅ‘rizze a jelszavait, Ã©s prÃ³bÃ¡lja meg Ãºjra.",
+"Could not change your file encryption password to your login password" => "Nem mÃ³dosÃthatja a fÃ¡jltitkosÃtÃ¡si jelszavÃ¡t a bejelentkezÃ©si jelszavÃ¡ra",
+"Choose encryption mode:" => "VÃ¡lassza ki a titkosÃtÃ¡si mÃ³dot:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Kliens oldali titkosÃtÃ¡s (biztonsÃ¡gosabb, de lehetetlennÃ© teszi a fÃ¡jlok elÃ©rÃ©sÃ©t a bÃ¶ngÃ©szÅ‘bÅ‘l)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "KiszolgÃ¡lÃ³ oldali titkosÃtÃ¡s (lehetÅ‘vÃ© teszi a fÃ¡jlok elÃ©rÃ©sÃ©t Ãºgy bÃ¶ngÃ©szÅ‘bÅ‘l mint az asztali kliensbÅ‘l)",
+"None (no encryption at all)" => "Semmi (semmilyen titkosÃtÃ¡s)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Fontos: Ha egyszer kivÃ¡lasztotta a titkosÃtÃ¡s mÃ³djÃ¡t, tÃ¶bbÃ© mÃ¡r nem lehet megvÃ¡ltoztatni",
+"User specific (let the user decide)" => "FelhasznÃ¡lÃ³ specifikus (a felhasznÃ¡lÃ³ vÃ¡laszthat)",
 "Encryption" => "TitkosÃtÃ¡s",
-"Enable Encryption" => "A titkosÃtÃ¡s engedÃ©lyezÃ©se",
-"None" => "Egyik sem",
-"Exclude the following file types from encryption" => "A kÃ¶vetkezÅ‘ fÃ¡jltÃpusok kizÃ¡rÃ¡sa a titkosÃtÃ¡sbÃ³l"
+"Exclude the following file types from encryption" => "A kÃ¶vetkezÅ‘ fÃ¡jltÃpusok kizÃ¡rÃ¡sa a titkosÃtÃ¡sbÃ³l",
+"None" => "Egyik sem"
 );
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 824ae88304101a447abc016d949678621391d652..20f33b87829edaac7a24499a373c75344b060efc 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "enkripsi",
 "Exclude the following file types from encryption" => "pengecualian untuk tipe file berikut dari enkripsi",
-"None" => "tidak ada",
-"Enable Encryption" => "aktifkan enkripsi"
+"None" => "tidak ada"
 );
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
index 3210ecb4f8a15861d2fd2983a8ac84705af16a94..a2559cf2b76c9ea4103cd1eb457979c11ab10a24 100644
--- a/apps/files_encryption/l10n/is.php
+++ b/apps/files_encryption/l10n/is.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "DulkÃ³Ã°un",
-"Enable Encryption" => "Virkja dulkÃ³Ã°un",
-"None" => "Ekkert",
-"Exclude the following file types from encryption" => "Undanskilja eftirfarandi skrÃ¡artegundir frÃ¡ dulkÃ³Ã°un"
+"Exclude the following file types from encryption" => "Undanskilja eftirfarandi skrÃ¡artegundir frÃ¡ dulkÃ³Ã°un",
+"None" => "Ekkert"
 );
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 5136b061797344fb2f8137357abe88d1f7440f5d..0c394564e0f78f1b905406bd67d205a968e65f13 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Passa al tuo client ownCloud e cambia la password di cifratura per completare la conversione.",
+"switched to client side encryption" => "passato alla cifratura lato client",
+"Change encryption password to login password" => "Converti la password di cifratura nella password di accesso",
+"Please check your passwords and try again." => "Controlla la password e prova ancora.",
+"Could not change your file encryption password to your login password" => "Impossibile convertire la password di cifratura nella password di accesso",
+"Choose encryption mode:" => "Scegli la modalitÃ  di cifratura.",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Cifratura lato client (piÃ¹ sicura ma rende impossibile accedere ai propri dati dall'interfaccia web)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Cifratura lato server (ti consente di accedere ai tuoi file dall'interfaccia web e dal client desktop)",
+"None (no encryption at all)" => "Nessuna (senza alcuna cifratura)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Importante: una volta selezionata la modalitÃ  di cifratura non sarÃ  possibile tornare indietro",
+"User specific (let the user decide)" => "Specificato dall'utente (lascia decidere all'utente)",
 "Encryption" => "Cifratura",
 "Exclude the following file types from encryption" => "Escludi i seguenti tipi di file dalla cifratura",
-"None" => "Nessuna",
-"Enable Encryption" => "Abilita cifratura"
+"None" => "Nessuna"
 );
diff --git a/apps/files_encryption/l10n/ja_JP.php b/apps/files_encryption/l10n/ja_JP.php
index 2c3e5410de3584eb827de47807dcabe05340f607..4100908e00c11d7b8c35ff7d1462d2ad200f5282 100644
--- a/apps/files_encryption/l10n/ja_JP.php
+++ b/apps/files_encryption/l10n/ja_JP.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "å¤‰æ›ã‚’å®Œäº†ã™ã‚‹ãŸã‚ã«ã€ownCloud ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã«åˆ‡ã‚Šæ›¿ãˆã¦ã€æš—å·åŒ–ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å¤‰æ›´ã—ã¦ãã ã•ã„ã€‚",
+"switched to client side encryption" => "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚µã‚¤ãƒ‰ã®æš—å·åŒ–ã«åˆ‡ã‚Šæ›¿ãˆã¾ã—ãŸ",
+"Change encryption password to login password" => "æš—å·åŒ–ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒã‚°ã‚¤ãƒ³ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã«å¤‰æ›´",
+"Please check your passwords and try again." => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ç¢ºèªã—ã¦ã‚‚ã†ä¸€åº¦è¡Œãªã£ã¦ãã ã•ã„ã€‚",
+"Could not change your file encryption password to your login password" => "ãƒ•ã‚¡ã‚¤ãƒ«æš—å·åŒ–ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒã‚°ã‚¤ãƒ³ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã«å¤‰æ›´ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚",
+"Choose encryption mode:" => "æš—å·åŒ–ãƒ¢ãƒ¼ãƒ‰ã‚’é¸æŠž:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚µã‚¤ãƒ‰ã®æš—å·åŒ–ï¼ˆæœ€ã‚‚ã‚»ã‚ãƒ¥ã‚¢ã§ã™ãŒã€WEBã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªããªã‚Šã¾ã™ï¼‰",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "ã‚µãƒ¼ãƒã‚µã‚¤ãƒ‰æš—å·åŒ–ï¼ˆWEBã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ãŠã‚ˆã³ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼‰",
+"None (no encryption at all)" => "æš—å·åŒ–ç„¡ã—ï¼ˆä½•ã‚‚æš—å·åŒ–ã—ã¾ã›ã‚“ï¼‰",
+"Important: Once you selected an encryption mode there is no way to change it back" => "é‡è¦: ä¸€åº¦æš—å·åŒ–ã‚’é¸æŠžã—ã¦ã—ã¾ã†ã¨ã€ã‚‚ã¨ã«æˆ»ã™æ–¹æ³•ã¯ã‚ã‚Šã¾ã›ã‚“",
+"User specific (let the user decide)" => "ãƒ¦ãƒ¼ã‚¶æŒ‡å®šï¼ˆãƒ¦ãƒ¼ã‚¶ãŒé¸ã¹ã‚‹ã‚ˆã†ã«ã™ã‚‹ï¼‰",
 "Encryption" => "æš—å·åŒ–",
 "Exclude the following file types from encryption" => "æš—å·åŒ–ã‹ã‚‰é™¤å¤–ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—",
-"None" => "ãªã—",
-"Enable Encryption" => "æš—å·åŒ–ã‚’æœ‰åŠ¹ã«ã™ã‚‹"
+"None" => "ãªã—"
 );
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index 4702753435ebdaf32a3547976bc0a67132b7405d..68d60c1ae30b033b7629f49924024bc63947f79e 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "ì•”í˜¸í™”",
 "Exclude the following file types from encryption" => "ë‹¤ìŒ íŒŒì¼ í˜•ì‹ì€ ì•”í˜¸í™”í•˜ì§€ ì•ŠìŒ",
-"None" => "ì—†ìŒ",
-"Enable Encryption" => "ì•”í˜¸í™” ì‚¬ìš©"
+"None" => "ì—†ìŒ"
 );
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
index bd8977ac5156b6a6116a9b4a4dc38ff8a1ee115f..06bb9b932514d6f4be0ff2a9fc152f9104ae667f 100644
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ b/apps/files_encryption/l10n/ku_IQ.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ù†Ù‡ÛŽÙ†ÛŒÚ©Ø±Ø¯Ù†",
 "Exclude the following file types from encryption" => "Ø¨Ù‡â€ŒØ±Ø¨Ù‡â€ŒØ³Øª Ú©Ø±Ø¯Ù†ÛŒ Ø¦Ù‡â€ŒÙ… Ø¬Û†Ø±Ù‡â€Œ Ù¾Ù‡â€ŒÚ•Ú¯Ø§Ù†Ù‡ Ù„Ù‡â€Œ Ù†Ù‡ÛŽÙ†ÛŒÚ©Ø±Ø¯Ù†",
-"None" => "Ù‡ÛŒÚ†",
-"Enable Encryption" => "Ú†Ø§Ù„Ø§Ú©Ø±Ø¯Ù†ÛŒ Ù†Ù‡ÛŽÙ†ÛŒÚ©Ø±Ø¯Ù†"
+"None" => "Ù‡ÛŒÚ†"
 );
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index b939df164c8576b82cc5c59489905e986b5a171c..22cbe7a4ffa3727bbfb18999a97ec81da568df5d 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Å ifravimas",
 "Exclude the following file types from encryption" => "NeÅ¡ifruoti pasirinkto tipo failÅ³",
-"None" => "Nieko",
-"Enable Encryption" => "Ä®jungti Å¡ifravimÄ…"
+"None" => "Nieko"
 );
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index dfcaed9f37eda45ee0ff3f1402fa682e4005a8e7..7ccf8ac2d5b92a3eb8e3e00a2f10dfbc59879a2c 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ð•Ð½ÐºÑ€Ð¸Ð¿Ñ†Ð¸Ñ˜Ð°",
 "Exclude the following file types from encryption" => "Ð˜ÑÐºÐ»ÑƒÑ‡Ð¸ Ð³Ð¸ ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¸ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ Ð¾Ð´ ÐµÐ½ÐºÑ€Ð¸Ð¿Ñ†Ð¸Ñ˜Ð°",
-"None" => "ÐÐ¸ÑˆÑ‚Ð¾",
-"Enable Encryption" => "ÐžÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ ÐµÐ½ÐºÑ€Ð¸Ð¿Ñ†Ð¸Ñ˜Ð°"
+"None" => "ÐÐ¸ÑˆÑ‚Ð¾"
 );
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index e65df7b6ce30ec1cf6ceaef2d9fea62c69efb426..2ec6670e928563e34be13b8f361438d6b209ea25 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Kryptering",
 "Exclude the following file types from encryption" => "Ekskluder fÃ¸lgende filer fra kryptering",
-"None" => "Ingen",
-"Enable Encryption" => "SlÃ¥ pÃ¥ kryptering"
+"None" => "Ingen"
 );
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 1ea56006fc3933793dbef249773abc76e1183d76..7c09009cba90091c0933fa7163d5695c65bf381d 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Versleuteling",
 "Exclude the following file types from encryption" => "Versleutel de volgende bestand types niet",
-"None" => "Geen",
-"Enable Encryption" => "Zet versleuteling aan"
+"None" => "Geen"
 );
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 5cfc707450e17664ec6060650ca11343b1b0c336..896086108ec8e2cc593d0990b5c6e3c8aa0776da 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Szyfrowanie",
 "Exclude the following file types from encryption" => "WyÅ‚Ä…cz nastÄ™pujÄ…ce typy plikÃ³w z szyfrowania",
-"None" => "Brak",
-"Enable Encryption" => "WÅ‚Ä…cz szyfrowanie"
+"None" => "Brak"
 );
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 5c02f52217fdf6a72b381928a45b74d978b74d79..086d073cf5c5fbb499644c2533d57c2297027ac1 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Criptografia",
 "Exclude the following file types from encryption" => "Excluir os seguintes tipos de arquivo da criptografia",
-"None" => "Nenhuma",
-"Enable Encryption" => "Habilitar Criptografia"
+"None" => "Nenhuma"
 );
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index 570462b414f593db9250ca819f07b21cc22b124a..b6eedcdc5095266da98fa1dda5267fa7030472fa 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Por favor, use o seu cliente de sincronizaÃ§Ã£o do ownCloud e altere a sua password de encriptaÃ§Ã£o para concluÃr a conversÃ£o.",
+"switched to client side encryption" => "Alterado para encriptaÃ§Ã£o do lado do cliente",
+"Change encryption password to login password" => "Alterar a password de encriptaÃ§Ã£o para a password de login",
+"Please check your passwords and try again." => "Por favor verifique as suas paswords e tente de novo.",
+"Could not change your file encryption password to your login password" => "NÃ£o foi possÃvel alterar a password de encriptaÃ§Ã£o de ficheiros para a sua password de login",
+"Choose encryption mode:" => "Escolha o mÃ©todo de encriptaÃ§Ã£o",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "EncriptaÃ§Ã£o do lado do cliente (mais seguro mas torna possÃvel o acesso aos dados atravÃ©s do interface web)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "EncriptaÃ§Ã£o do lado do servidor (permite o acesso aos seus ficheiros atravÃ©s do interface web e do cliente de sincronizaÃ§Ã£o)",
+"None (no encryption at all)" => "Nenhuma (sem encriptaÃ§Ã£o)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Importante: Uma vez escolhido o modo de encriptaÃ§Ã£o, nÃ£o existe maneira de o alterar!",
+"User specific (let the user decide)" => "Escolhido pelo utilizador",
 "Encryption" => "EncriptaÃ§Ã£o",
 "Exclude the following file types from encryption" => "Excluir da encriptaÃ§Ã£o os seguintes tipo de ficheiros",
-"None" => "Nenhum",
-"Enable Encryption" => "Activar EncriptaÃ§Ã£o"
+"None" => "Nenhum"
 );
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index 97f3f262d76e9a93de01ee3c7932f66665fae905..f958692dd8d92a2402d0acc6ec638b4aa466662b 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "Te rugÄƒm sÄƒ mergi Ã®n clientul ownCloud È™i sÄƒ schimbi parola pentru a finisa conversia",
+"switched to client side encryption" => "setat la encriptare localÄƒ",
+"Change encryption password to login password" => "SchimbÄƒ parola de ecriptare Ã®n parolÄƒ de acces",
+"Please check your passwords and try again." => "VerificÄƒ te rog parolele È™i Ã®nceracÄƒ din nou.",
+"Could not change your file encryption password to your login password" => "Nu s-a putut schimba parola de encripÈ›ie a fiÈ™ierelor ca parolÄƒ de acces",
+"Choose encryption mode:" => "Alege tipul de ecripÈ›ie",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "EncripÈ›ie localÄƒ (cea mai sigurÄƒ, dar face ca datele sÄƒ nu mai fie accesibile din interfaÈ›a web)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "EncripÈ›ie pe server (permite sÄƒ accesezi datele tale din interfaÈ›a web È™i din clientul pentru calculator)",
+"None (no encryption at all)" => "FÄƒrÄƒ (nici un fel de ecriptare)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Important: Din moment ce ai setat un mod de encriptare, nu mai existÄƒ metode de a-l schimba Ã®napoi",
+"User specific (let the user decide)" => "Spefic fiecÄƒrui utilizator (lasÄƒ utilizatorul sÄƒ decidÄƒ)",
 "Encryption" => "ÃŽncriptare",
 "Exclude the following file types from encryption" => "Exclude urmÄƒtoarele tipuri de fiÈ™iere de la Ã®ncriptare",
-"None" => "Niciuna",
-"Enable Encryption" => "Activare Ã®ncriptare"
+"None" => "Niciuna"
 );
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 3a7e84b6d01e7b31f1a999452f0a5e22f6b4d770..14115c12683c03f92bebc50ecbddd4f9a74de536 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ",
 "Exclude the following file types from encryption" => "Ð˜ÑÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ñ… Ñ‚Ð¸Ð¿Ð¾Ð² Ñ„Ð°Ð¹Ð»Ð¾Ð²",
-"None" => "ÐÐ¸Ñ‡ÐµÐ³Ð¾",
-"Enable Encryption" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
+"None" => "ÐÐ¸Ñ‡ÐµÐ³Ð¾"
 );
diff --git a/apps/files_encryption/l10n/ru_RU.php b/apps/files_encryption/l10n/ru_RU.php
index 1328b0d03596d3b4c46bc3d7ee71415169b343cd..4321fb8a8a33988c58dde54a3e16a25012dfe05f 100644
--- a/apps/files_encryption/l10n/ru_RU.php
+++ b/apps/files_encryption/l10n/ru_RU.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ",
 "Exclude the following file types from encryption" => "Ð˜ÑÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ñ‚Ð¸Ð¿Ñ‹ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¸Ð· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ",
-"None" => "ÐÐ¸ Ð¾Ð´Ð¸Ð½",
-"Enable Encryption" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
+"None" => "ÐÐ¸ Ð¾Ð´Ð¸Ð½"
 );
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
index a29884afffd89dce95dcb191e266bca50476214c..2d61bec45b825cef384310b83ac777618293d902 100644
--- a/apps/files_encryption/l10n/si_LK.php
+++ b/apps/files_encryption/l10n/si_LK.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "à¶œà·”à¶´à·Šà¶ à¶šà·šà¶à¶±à¶º",
 "Exclude the following file types from encryption" => "à¶¸à·™à¶¸ à¶œà·œà¶±à·” à·€à¶»à·Šà¶œ à¶œà·”à¶´à·Šà¶ à¶šà·šà¶à¶±à¶º à¶šà·’à¶»à·“à¶¸à·™à¶±à·Š à¶¶à·à·„à·à¶»à·€ à¶à¶¶à¶±à·Šà¶±",
-"None" => "à¶šà·’à·ƒà·’à·€à¶šà·Š à¶±à·à¶",
-"Enable Encryption" => "à¶œà·”à¶´à·Šà¶ à¶šà·šà¶à¶±à¶º à·ƒà¶šà·Šâ€à¶»à·’à¶º à¶šà¶»à¶±à·Šà¶±"
+"None" => "à¶šà·’à·ƒà·’à·€à¶šà·Š à¶±à·à¶"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 598f1294f6ec69633ffe9668bc2f07f52a0fd7f8..355b45a4ce2c7f9234d78749c75417404a350270 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "ProsÃm, prejdite do svojho klienta ownCloud a zmente Å¡ifrovacie heslo na dokonÄenie konverzie.",
+"switched to client side encryption" => "prepnutÃ© na Å¡ifrovanie prostrednÃctvom klienta",
+"Change encryption password to login password" => "ZmeniÅ¥ Å¡ifrovacie heslo na prihlasovacie",
+"Please check your passwords and try again." => "Skontrolujte si heslo a skÃºste to znovu.",
+"Could not change your file encryption password to your login password" => "Nie je moÅ¾nÃ© zmeniÅ¥ Å¡ifrovacie heslo na prihlasovacie",
+"Choose encryption mode:" => "Vyberte reÅ¾im Å¡ifrovania:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Å ifrovanie prostrednÃctvom klienta (najbezpeÄnejÅ¡ia voÄ¾ba, neumoÅ¾Åˆuje vÅ¡ak prÃstup k sÃºborom z webovÃ©ho rozhrania)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Å ifrovanie na serveri (umoÅ¾Åˆuje pristupovaÅ¥ k sÃºborom z webovÃ©ho rozhrania a desktopovÃ©ho klienta)",
+"None (no encryption at all)" => "Å½iadne (Å¾iadne Å¡ifrovanie)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "DÃ´leÅ¾itÃ©: ak si zvolÃte reÅ¾im Å¡ifrovania, nie je moÅ¾nÃ© ho znovu zruÅ¡iÅ¥",
+"User specific (let the user decide)" => "DefinovanÃ½ pouÅ¾ÃvateÄ¾om (umoÅ¾Åˆuje pouÅ¾ÃvateÄ¾ovi vybraÅ¥ si)",
 "Encryption" => "Å ifrovanie",
 "Exclude the following file types from encryption" => "VynechaÅ¥ nasledujÃºce sÃºbory pri Å¡ifrovanÃ",
-"None" => "Å½iadne",
-"Enable Encryption" => "ZapnÃºÅ¥ Å¡ifrovanie"
+"None" => "Å½iadne"
 );
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index f62fe781c6aac5d3345f7f08b4dc3054571369d6..db963ef2f8dc22c21f1ec240206a8c41e8528ef7 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Å ifriranje",
 "Exclude the following file types from encryption" => "Navedene vrste datotek naj ne bodo Å¡ifrirane",
-"None" => "Brez",
-"Enable Encryption" => "OmogoÄi Å¡ifriranje"
+"None" => "Brez"
 );
diff --git a/apps/files_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
index 4718780ee5232cc1e6a265810e30805c53383140..198bcc94ef96aa1573d441bd185dbc583d8b56d2 100644
--- a/apps/files_encryption/l10n/sr.php
+++ b/apps/files_encryption/l10n/sr.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐµ",
 "Exclude the following file types from encryption" => "ÐÐµ ÑˆÐ¸Ñ„Ñ€ÑƒÑ˜ ÑÐ»ÐµÐ´ÐµÑ›Ðµ Ñ‚Ð¸Ð¿Ð¾Ð²Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°",
-"None" => "ÐÐ¸ÑˆÑ‚Ð°",
-"Enable Encryption" => "ÐžÐ¼Ð¾Ð³ÑƒÑ›Ð¸ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐµ"
+"None" => "ÐÐ¸ÑˆÑ‚Ð°"
 );
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 0a477f834609cc6c0304b125d9b04c6fbecd6089..9b6ce141782954ad4c9c0af1800a50c9db6b9151 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "VÃ¤nligen vÃ¤xla till ownCloud klienten och Ã¤ndra ditt krypteringslÃ¶senord fÃ¶r att slutfÃ¶ra omvandlingen.",
+"switched to client side encryption" => "Bytte till kryptering pÃ¥ klientsidan",
+"Change encryption password to login password" => "Ã„ndra krypteringslÃ¶senord till loginlÃ¶senord",
+"Please check your passwords and try again." => "Kontrollera dina lÃ¶senord och fÃ¶rsÃ¶k igen.",
+"Could not change your file encryption password to your login password" => "Kunde inte Ã¤ndra ditt filkrypteringslÃ¶senord till ditt loginlÃ¶senord",
+"Choose encryption mode:" => "VÃ¤lj krypteringslÃ¤ge:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "Kryptering pÃ¥ klientsidan (sÃ¤kraste men gÃ¶r det omÃ¶jligt att komma Ã¥t dina filer med en webblÃ¤sare)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "Kryptering pÃ¥ serversidan (kan komma Ã¥t dina filer frÃ¥n webblÃ¤sare och datorklient)",
+"None (no encryption at all)" => "Ingen (ingen kryptering alls)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "Viktigt: NÃ¤r du har valt ett krypteringslÃ¤ge finns det inget sÃ¤tt att Ã¤ndra tillbaka",
+"User specific (let the user decide)" => "AnvÃ¤ndarspecifik (lÃ¥ter anvÃ¤ndaren bestÃ¤mma)",
 "Encryption" => "Kryptering",
 "Exclude the following file types from encryption" => "Exkludera fÃ¶ljande filtyper frÃ¥n kryptering",
-"None" => "Ingen",
-"Enable Encryption" => "Aktivera kryptering"
+"None" => "Ingen"
 );
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
index 1d1ef74007edf2d61dfb1d9e9b66c397a9efa4cc..aab628b55198a4a11eb5228a17ab4062fa681dbb 100644
--- a/apps/files_encryption/l10n/ta_LK.php
+++ b/apps/files_encryption/l10n/ta_LK.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "à®®à®±à¯ˆà®•à¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯",
 "Exclude the following file types from encryption" => "à®®à®±à¯ˆà®•à¯à®•à¯à®±à®¿à®¯à®¾à®•à¯à®•à®²à®¿à®²à¯ à®ªà®¿à®©à¯à®µà®°à¯à®®à¯ à®•à¯‹à®ªà¯à®ªà¯ à®µà®•à¯ˆà®•à®³à¯ˆ à®¨à¯€à®•à¯à®•à®µà¯à®®à¯",
-"None" => "à®’à®©à¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ",
-"Enable Encryption" => "à®®à®±à¯ˆà®•à¯à®•à¯à®±à®¿à®¯à®¾à®•à¯à®•à®²à¯ˆ à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
+"None" => "à®’à®©à¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
 );
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index c2685de6e3a76a614d7a177abc64e7a7dc8e57ca..f8c19456ab324db40a6fc2ddf15b569b3a49e791 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "à¸à¸£à¸¸à¸“à¸²à¸ªà¸¥à¸±à¸šà¹„à¸›à¸—à¸µà¹ˆà¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œ ownCloud à¸‚à¸à¸‡à¸„à¸¸à¸“ à¹à¸¥à¹‰à¸§à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹€à¸žà¸·à¹ˆà¸à¹à¸›à¸¥à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸«à¹‰à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸¡à¸šà¸¹à¸£à¸“à¹Œ",
+"switched to client side encryption" => "à¸ªà¸¥à¸±à¸šà¹„à¸›à¹ƒà¸Šà¹‰à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸ˆà¸²à¸à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œ",
+"Change encryption password to login password" => "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹„à¸›à¹€à¸›à¹‡à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š",
+"Please check your passwords and try again." => "à¸à¸£à¸¸à¸“à¸²à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¹à¸¥à¹‰à¸§à¸¥à¸à¸‡à¹ƒà¸«à¸¡à¹ˆà¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡",
+"Could not change your file encryption password to your login password" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸›à¹€à¸›à¹‡à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸”à¹‰",
+"Choose encryption mode:" => "à¹€à¸¥à¸·à¸à¸à¸£à¸¹à¸›à¹à¸šà¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª:",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸”à¹‰à¸§à¸¢à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œ (à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸—à¸µà¹ˆà¸ªà¸¸à¸” à¹à¸•à¹ˆà¸ˆà¸°à¸—à¸³à¹ƒà¸«à¹‰à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸•à¹ˆà¸²à¸‡à¹†à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¸ˆà¸à¹€à¸§à¹‡à¸šà¹„à¸‹à¸•à¹Œà¹„à¸”à¹‰)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸ˆà¸²à¸à¸—à¸²à¸‡à¸à¸±à¹ˆà¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ (à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸„à¸¸à¸“à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¸ˆà¸à¹€à¸§à¹‡à¸šà¹„à¸‹à¸•à¹Œ à¹à¸¥à¸°à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œà¸ˆà¸²à¸à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¹€à¸”à¸ªà¸à¹Œà¸—à¹‡à¸à¸›à¹„à¸”à¹‰)",
+"None (no encryption at all)" => "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡ (à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹€à¸¥à¸¢)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡à¸ªà¸³à¸„à¸±à¸: à¸«à¸¥à¸±à¸‡à¸ˆà¸²à¸à¸—à¸µà¹ˆà¸„à¸¸à¸“à¹„à¸”à¹‰à¹€à¸¥à¸·à¸à¸à¸£à¸¹à¸›à¹à¸šà¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹à¸¥à¹‰à¸§ à¸ˆà¸°à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸à¸¥à¸±à¸šà¸¡à¸²à¹ƒà¸«à¸¡à¹ˆà¹„à¸”à¹‰à¸à¸µà¸",
+"User specific (let the user decide)" => "à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹€à¸¥à¸·à¸à¸à¹€à¸à¸‡ (à¸›à¸¥à¹ˆà¸à¸¢à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸•à¸±à¸”à¸ªà¸´à¸™à¹ƒà¸ˆà¹€à¸à¸‡)",
 "Encryption" => "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª",
 "Exclude the following file types from encryption" => "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡à¸£à¸§à¸¡à¸Šà¸™à¸´à¸”à¸‚à¸à¸‡à¹„à¸Ÿà¸¥à¹Œà¸”à¸±à¸‡à¸•à¹ˆà¸à¹„à¸›à¸™à¸µà¹‰à¸ˆà¸²à¸à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª",
-"None" => "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡",
-"Enable Encryption" => "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª"
+"None" => "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡"
 );
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 474ee42b842d835a606c9508e1fbb2f0a45ae1bb..07f78d148c85f0b9c2a61d588bc1546e745a4d68 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Åžifreleme",
-"Enable Encryption" => "Åžifrelemeyi EtkinleÅŸtir",
-"None" => "HiÃ§biri",
-"Exclude the following file types from encryption" => "AÅŸaÄŸÄ±daki dosya tiplerini ÅŸifrelemeye dahil etme"
+"Exclude the following file types from encryption" => "AÅŸaÄŸÄ±daki dosya tiplerini ÅŸifrelemeye dahil etme",
+"None" => "HiÃ§biri"
 );
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 3c15bb284368fee51bb97314744083b0e9cc4659..e3589215658e8871bcc693a5e19a8a91b6c18630 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ",
 "Exclude the following file types from encryption" => "ÐÐµ ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»Ð¸ Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ñ… Ñ‚Ð¸Ð¿Ñ–Ð²",
-"None" => "Ð–Ð¾Ð´ÐµÐ½",
-"Enable Encryption" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ"
+"None" => "Ð–Ð¾Ð´ÐµÐ½"
 );
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 6365084fdc6642578038be515e72db0d9ac4378b..218285b675a66b1b4d06d1be8516b9b98423cff5 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "MÃ£ hÃ³a",
 "Exclude the following file types from encryption" => "Loáº¡i trá»« cÃ¡c loáº¡i táºp tin sau Ä‘Ã¢y tá»« mÃ£ hÃ³a",
-"None" => "KhÃ´ng cÃ³ gÃ¬ háº¿t",
-"Enable Encryption" => "Báº¬T mÃ£ hÃ³a"
+"None" => "KhÃ´ng cÃ³ gÃ¬ háº¿t"
 );
diff --git a/apps/files_encryption/l10n/zh_CN.GB2312.php b/apps/files_encryption/l10n/zh_CN.GB2312.php
index 297444fcf558cc43f74b1ff8269c24691d4bf2a2..31a3d3b49b83c2047fd141cb93057c0dcd268e6b 100644
--- a/apps/files_encryption/l10n/zh_CN.GB2312.php
+++ b/apps/files_encryption/l10n/zh_CN.GB2312.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "åŠ å¯†",
 "Exclude the following file types from encryption" => "ä»ŽåŠ å¯†ä¸æŽ’é™¤å¦‚ä¸‹æ–‡ä»¶ç±»åž‹",
-"None" => "æ— ",
-"Enable Encryption" => "å¯ç”¨åŠ å¯†"
+"None" => "æ— "
 );
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 1e1247d15ffa4bb03e64a242ad63d671c2ed39d8..aa4817b590c69d257c43326f71e54225ff947060 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "åŠ å¯†",
 "Exclude the following file types from encryption" => "ä»ŽåŠ å¯†ä¸æŽ’é™¤åˆ—å‡ºçš„æ–‡ä»¶ç±»åž‹",
-"None" => "None",
-"Enable Encryption" => "å¼€å¯åŠ å¯†"
+"None" => "None"
 );
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 4c62130cf4f7b94977d99001a9f9a87eb151ebaf..146724def0825f22f29b41384a5fe9c1b330d16a 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,6 +1,16 @@
 <?php $TRANSLATIONS = array(
+"Please switch to your ownCloud client and change your encryption password to complete the conversion." => "è«‹è‡³æ‚¨çš„ ownCloud å®¢æˆ¶ç«¯ç¨‹å¼ä¿®æ”¹æ‚¨çš„åŠ å¯†å¯†ç¢¼ä»¥å®Œæˆè½‰æ›ã€‚",
+"switched to client side encryption" => "å·²åˆ‡æ›ç‚ºå®¢æˆ¶ç«¯åŠ å¯†",
+"Change encryption password to login password" => "å°‡åŠ å¯†å¯†ç¢¼ä¿®æ”¹ç‚ºç™»å…¥å¯†ç¢¼",
+"Please check your passwords and try again." => "è«‹æª¢æŸ¥æ‚¨çš„å¯†ç¢¼ä¸¦å†è©¦ä¸€æ¬¡ã€‚",
+"Could not change your file encryption password to your login password" => "ç„¡æ³•è®Šæ›´æ‚¨çš„æª”æ¡ˆåŠ å¯†å¯†ç¢¼ç‚ºç™»å…¥å¯†ç¢¼",
+"Choose encryption mode:" => "é¸æ“‡åŠ å¯†æ¨¡å¼ï¼š",
+"Client side encryption (most secure but makes it impossible to access your data from the web interface)" => "å®¢æˆ¶ç«¯åŠ å¯† (æœ€å®‰å…¨ä½†æ˜¯æœƒä½¿æ‚¨ç„¡æ³•å¾žç¶²é ç•Œé¢å˜å–æ‚¨çš„æª”æ¡ˆ)",
+"Server side encryption (allows you to access your files from the web interface and the desktop client)" => "ä¼ºæœå™¨ç«¯åŠ å¯† (æ‚¨å¯ä»¥å¾žç¶²é ç•Œé¢åŠå®¢æˆ¶ç«¯ç¨‹å¼å˜å–æ‚¨çš„æª”æ¡ˆ)",
+"None (no encryption at all)" => "ç„¡ (ä¸åŠ å¯†)",
+"Important: Once you selected an encryption mode there is no way to change it back" => "é‡è¦ï¼šä¸€æ—¦æ‚¨é¸æ“‡äº†åŠ å¯†å°±ç„¡æ³•å†æ”¹å›žä¾†",
+"User specific (let the user decide)" => "ä½¿ç”¨è€…è‡ªè¨‚ (è®“ä½¿ç”¨è€…è‡ªå·±æ±ºå®š)",
 "Encryption" => "åŠ å¯†",
 "Exclude the following file types from encryption" => "ä¸‹åˆ—çš„æª”æ¡ˆé¡žåž‹ä¸åŠ å¯†",
-"None" => "ç„¡",
-"Enable Encryption" => "å•Ÿç”¨åŠ å¯†"
+"None" => "ç„¡"
 );
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
old mode 100644
new mode 100755
index 666fedb4e1b459cd0aed29380b41c8832240a05f..fddc89dae54b83da0f9f6c5d4b0ee8c5cc250dc0
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -1,220 +1,732 @@
-<?php
-/**
- * ownCloud
- *
- * @author Frank Karlitschek
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-
-
-// Todo:
-//  - Crypt/decrypt button in the userinterface
-//  - Setting if crypto should be on by default
-//  - Add a setting "DonÂ´t encrypt files larger than xx because of performance reasons"
-//  - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is encrypted (.encrypted extension)
-//  - Don't use a password directly as encryption key, but a key which is stored on the server and encrypted with the
-//    user password. -> password change faster
-//  - IMPORTANT! Check if the block lenght of the encrypted data stays the same
-
-
-require_once 'Crypt_Blowfish/Blowfish.php';
-
-/**
- * This class is for crypting and decrypting
- */
-class OC_Crypt {
-	static private $bf = null;
-
-	public static function loginListener($params) {
-		self::init($params['uid'], $params['password']);
-	}
-
-	public static function init($login, $password) {
-		$view=new OC_FilesystemView('/');
-		if ( ! $view->file_exists('/'.$login)) {
-			$view->mkdir('/'.$login);
-		}
-
-		OC_FileProxy::$enabled=false;
-		if ( ! $view->file_exists('/'.$login.'/encryption.key')) {// does key exist?
-			OC_Crypt::createkey($login, $password);
-		}
-		$key=$view->file_get_contents('/'.$login.'/encryption.key');
-		OC_FileProxy::$enabled=true;
-		$_SESSION['enckey']=OC_Crypt::decrypt($key, $password);
-	}
-
-
-	/**
-	 * get the blowfish encryption handeler for a key
-	 * @param string $key (optional)
-	 * @return Crypt_Blowfish
-	 *
-	 * if the key is left out, the default handeler will be used
-	 */
-	public static function getBlowfish($key='') {
-		if ($key) {
-			return new Crypt_Blowfish($key);
-		} else {
-			if ( ! isset($_SESSION['enckey'])) {
-				return false;
-			}
-			if ( ! self::$bf) {
-				self::$bf=new Crypt_Blowfish($_SESSION['enckey']);
-			}
-			return self::$bf;
-		}
-	}
-
-	public static function createkey($username, $passcode) {
-		// generate a random key
-		$key=mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999).mt_rand(10000, 99999);
-
-		// encrypt the key with the passcode of the user
-		$enckey=OC_Crypt::encrypt($key, $passcode);
-
-		// Write the file
-		$proxyEnabled=OC_FileProxy::$enabled;
-		OC_FileProxy::$enabled=false;
-		$view=new OC_FilesystemView('/'.$username);
-		$view->file_put_contents('/encryption.key', $enckey);
-		OC_FileProxy::$enabled=$proxyEnabled;
-	}
-
-	public static function changekeypasscode($oldPassword, $newPassword) {
-		if (OCP\User::isLoggedIn()) {
-			$username=OCP\USER::getUser();
-			$view=new OC_FilesystemView('/'.$username);
-
-			// read old key
-			$key=$view->file_get_contents('/encryption.key');
-
-			// decrypt key with old passcode
-			$key=OC_Crypt::decrypt($key, $oldPassword);
-
-			// encrypt again with new passcode
-			$key=OC_Crypt::encrypt($key, $newPassword);
-
-			// store the new key
-			$view->file_put_contents('/encryption.key', $key );
-		}
-	}
-
-	/**
-	 * @brief encrypts an content
-	 * @param $content the cleartext message you want to encrypt
-	 * @param $key the encryption key (optional)
-	 * @returns encrypted content
-	 *
-	 * This function encrypts an content
-	 */
-	public static function encrypt( $content, $key='') {
-		$bf = self::getBlowfish($key);
-		return $bf->encrypt($content);
-	}
-
-	/**
-	* @brief decryption of an content
-	* @param $content the cleartext message you want to decrypt
-	* @param $key the encryption key (optional)
-	* @returns cleartext content
-	*
-	* This function decrypts an content
-	*/
-	public static function decrypt( $content, $key='') {
-		$bf = self::getBlowfish($key);
-		$data=$bf->decrypt($content);
-		return $data;
-	}
-
-	/**
-	* @brief encryption of a file
-	* @param string $source
-	* @param string $target
-	* @param string $key the decryption key
-	*
-	* This function encrypts a file
-	*/
-	public static function encryptFile( $source, $target, $key='') {
-		$handleread  = fopen($source, "rb");
-		if ($handleread!=false) {
-			$handlewrite = fopen($target, "wb");
-			while (!feof($handleread)) {
-				$content = fread($handleread, 8192);
-				$enccontent=OC_CRYPT::encrypt( $content, $key);
-				fwrite($handlewrite, $enccontent);
-			}
-			fclose($handlewrite);
-			fclose($handleread);
-		}
-	}
-
-
-	/**
-		* @brief decryption of a file
-		* @param string $source
-		* @param string $target
-		* @param string $key the decryption key
-		*
-		* This function decrypts a file
-		*/
-	public static function decryptFile( $source, $target, $key='') {
-		$handleread  = fopen($source, "rb");
-		if ($handleread!=false) {
-			$handlewrite = fopen($target, "wb");
-			while (!feof($handleread)) {
-				$content = fread($handleread, 8192);
-				$enccontent=OC_CRYPT::decrypt( $content, $key);
-				if (feof($handleread)) {
-					$enccontent=rtrim($enccontent, "\0");
-				}
-				fwrite($handlewrite, $enccontent);
-			}
-			fclose($handlewrite);
-			fclose($handleread);
-		}
-	}
-
-	/**
-	 * encrypt data in 8192b sized blocks
-	 */
-	public static function blockEncrypt($data, $key='') {
-		$result='';
-		while (strlen($data)) {
-			$result.=self::encrypt(substr($data, 0, 8192), $key);
-			$data=substr($data, 8192);
-		}
-		return $result;
-	}
-
-	/**
-	 * decrypt data in 8192b sized blocks
-	 */
-	public static function blockDecrypt($data, $key='', $maxLength=0) {
-		$result='';
-		while (strlen($data)) {
-			$result.=self::decrypt(substr($data, 0, 8192), $key);
-			$data=substr($data, 8192);
-		}
-		if ($maxLength>0) {
-			return substr($result, 0, $maxLength);
-		} else {
-			return rtrim($result, "\0");
-		}
-	}
-}
+<?php
+/**
+ * ownCloud
+ *
+ * @author Sam Tuke, Frank Karlitschek, Robin Appelman
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com, 
+ * Robin Appelman icewind@owncloud.com, Frank Karlitschek 
+ * frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Encryption;
+
+require_once 'Crypt_Blowfish/Blowfish.php';
+
+// Todo:
+//  - Crypt/decrypt button in the userinterface
+//  - Setting if crypto should be on by default
+//  - Add a setting "DonÂ´t encrypt files larger than xx because of performance reasons"
+//  - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is encrypted (.encrypted extension)
+//  - Don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster
+//  - IMPORTANT! Check if the block lenght of the encrypted data stays the same
+
+/**
+ * Class for common cryptography functionality
+ */
+
+class Crypt {
+
+	/**
+	 * @brief return encryption mode client or server side encryption
+	 * @param string user name (use system wide setting if name=null)
+	 * @return string 'client' or 'server'
+	 */
+	public static function mode( $user = null ) {
+		
+// 		$mode = \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' );
+// 
+// 		if ( $mode == 'user') {
+// 			if ( !$user ) {
+// 				$user = \OCP\User::getUser();
+// 			}
+// 			$mode = 'none';
+// 			if ( $user ) {
+// 				$query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
+// 				$result = $query->execute(array($user));
+// 				if ($row = $result->fetchRow()){
+// 					$mode = $row['mode'];
+// 				}
+// 			}
+// 		}
+// 		
+// 		return $mode;
+
+		return 'server';
+		
+	}
+	
+        /**
+         * @brief Create a new encryption keypair
+         * @return array publicKey, privatekey
+         */
+	public static function createKeypair() {
+		
+		$res = openssl_pkey_new();
+
+		// Get private key
+		openssl_pkey_export( $res, $privateKey );
+
+		// Get public key
+		$publicKey = openssl_pkey_get_details( $res );
+		
+		$publicKey = $publicKey['key'];
+		
+		return( array( 'publicKey' => $publicKey, 'privateKey' => $privateKey ) );
+	
+	}
+	
+        /**
+         * @brief Add arbitrary padding to encrypted data
+         * @param string $data data to be padded
+         * @return padded data
+         * @note In order to end up with data exactly 8192 bytes long we must add two letters. It is impossible to achieve exactly 8192 length blocks with encryption alone, hence padding is added to achieve the required length. 
+         */
+	public static function addPadding( $data ) {
+	
+		$padded = $data . 'xx';
+		
+		return $padded;
+	
+	}
+	
+        /**
+         * @brief Remove arbitrary padding to encrypted data
+         * @param string $padded padded data to remove padding from
+         * @return unpadded data on success, false on error
+         */
+	public static function removePadding( $padded ) {
+	
+		if ( substr( $padded, -2 ) == 'xx' ) {
+	
+			$data = substr( $padded, 0, -2 );
+			
+			return $data;
+		
+		} else {
+		
+			# TODO: log the fact that unpadded data was submitted for removal of padding
+			return false;
+			
+		}
+	
+	}
+	
+        /**
+         * @brief Check if a file's contents contains an IV and is symmetrically encrypted
+         * @return true / false
+         * @note see also OCA\Encryption\Util->isEncryptedPath()
+         */
+	public static function isEncryptedContent( $content ) {
+	
+		if ( !$content ) {
+		
+			return false;
+			
+		}
+		
+		$noPadding = self::removePadding( $content );
+		
+		// Fetch encryption metadata from end of file
+		$meta = substr( $noPadding, -22 );
+		
+		// Fetch IV from end of file
+		$iv = substr( $meta, -16 );
+		
+		// Fetch identifier from start of metadata
+		$identifier = substr( $meta, 0, 6 );
+		
+		if ( $identifier == '00iv00') {
+		
+			return true;
+			
+		} else {
+		
+			return false;
+			
+		}
+	
+	}
+	
+	/**
+	 * Check if a file is encrypted according to database file cache
+	 * @param string $path
+	 * @return bool
+	 */
+	public static function isEncryptedMeta( $path ) {
+	
+		# TODO: Use DI to get OC_FileCache_Cached out of here
+	
+		// Fetch all file metadata from DB
+		$metadata = \OC_FileCache_Cached::get( $path, '' );
+		
+		// Return encryption status
+		return isset( $metadata['encrypted'] ) and ( bool )$metadata['encrypted'];
+	
+	}
+	
+        /**
+         * @brief Check if a file is encrypted via legacy system
+         * @return true / false
+         */
+	public static function isLegacyEncryptedContent( $content ) {
+	
+		// Fetch all file metadata from DB
+		$metadata = \OC_FileCache_Cached::get( $content, '' );
+	
+		// If a file is flagged with encryption in DB, but isn't a valid content + IV combination, it's probably using the legacy encryption system
+		if ( 
+		$content
+		and isset( $metadata['encrypted'] ) 
+		and $metadata['encrypted'] === true 
+		and !self::isEncryptedContent( $content ) 
+		) {
+		
+			return true;
+		
+		} else {
+		
+			return false;
+			
+		}
+	
+	}
+	
+        /**
+         * @brief Symmetrically encrypt a string
+         * @returns encrypted file
+         */
+	public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
+		
+		if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+
+			return $encryptedContent;
+			
+		} else {
+		
+			\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of content failed' , \OC_Log::ERROR );
+			
+			return false;
+			
+		}
+	
+	}
+	
+        /**
+         * @brief Symmetrically decrypt a string
+         * @returns decrypted file
+         */
+	public static function decrypt( $encryptedContent, $iv, $passphrase ) {
+	
+		if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
+
+			return $plainContent;
+		
+			
+		} else {
+		
+			throw new \Exception( 'Encryption library: Decryption (symmetric) of content failed' );
+			
+			return false;
+			
+		}
+	
+	}
+	
+        /**
+         * @brief Concatenate encrypted data with its IV and padding
+         * @param string $content content to be concatenated
+         * @param string $iv IV to be concatenated
+         * @returns string concatenated content
+         */
+	public static function concatIv ( $content, $iv ) {
+	
+		$combined = $content . '00iv00' . $iv;
+		
+		return $combined;
+	
+	}
+	
+        /**
+         * @brief Split concatenated data and IV into respective parts
+         * @param string $catFile concatenated data to be split
+         * @returns array keys: encrypted, iv
+         */
+	public static function splitIv ( $catFile ) {
+	
+		// Fetch encryption metadata from end of file
+		$meta = substr( $catFile, -22 );
+		
+		// Fetch IV from end of file
+		$iv = substr( $meta, -16 );
+		
+		// Remove IV and IV identifier text to expose encrypted content
+		$encrypted = substr( $catFile, 0, -22 );
+	
+		$split = array(
+			'encrypted' => $encrypted
+			, 'iv' => $iv
+		);
+		
+		return $split;
+	
+	}
+	
+        /**
+         * @brief Symmetrically encrypts a string and returns keyfile content
+         * @param $plainContent content to be encrypted in keyfile
+         * @returns encrypted content combined with IV
+         * @note IV need not be specified, as it will be stored in the returned keyfile
+         * and remain accessible therein.
+         */
+	public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {
+		
+		if ( !$plainContent ) {
+		
+			return false;
+			
+		}
+		
+		$iv = self::generateIv();
+		
+		if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {
+			
+				// Combine content to encrypt with IV identifier and actual IV
+				$catfile = self::concatIv( $encryptedContent, $iv );
+				
+				$padded = self::addPadding( $catfile );
+				
+				return $padded;
+		
+		} else {
+		
+			\OC_Log::write( 'Encryption library', 'Encryption (symmetric) of keyfile content failed' , \OC_Log::ERROR );
+			
+			return false;
+			
+		}
+		
+	}
+
+
+	/**
+	* @brief Symmetrically decrypts keyfile content
+	* @param string $source
+	* @param string $target
+	* @param string $key the decryption key
+	* @returns decrypted content
+	*
+	* This function decrypts a file
+	*/
+	public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {
+	
+		if ( !$keyfileContent ) {
+		
+			throw new \Exception( 'Encryption library: no data provided for decryption' );
+			
+		}
+		
+		// Remove padding
+		$noPadding = self::removePadding( $keyfileContent );
+		
+		// Split into enc data and catfile
+		$catfile = self::splitIv( $noPadding );
+		
+		if ( $plainContent = self::decrypt( $catfile['encrypted'], $catfile['iv'], $passphrase ) ) {
+		
+			return $plainContent;
+			
+		}
+	
+	}
+	
+	/**
+	* @brief Creates symmetric keyfile content using a generated key
+	* @param string $plainContent content to be encrypted
+	* @returns array keys: key, encrypted
+	* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+	*
+	* This function decrypts a file
+	*/
+	public static function symmetricEncryptFileContentKeyfile( $plainContent ) {
+	
+		$key = self::generateKey();
+	
+		if( $encryptedContent = self::symmetricEncryptFileContent( $plainContent, $key ) ) {
+		
+			return array(
+				'key' => $key
+				, 'encrypted' => $encryptedContent
+			);
+		
+		} else {
+		
+			return false;
+			
+		}
+	
+	}
+	
+	/**
+	* @brief Create asymmetrically encrypted keyfile content using a generated key
+	* @param string $plainContent content to be encrypted
+	* @returns array keys: key, encrypted
+	* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+	*
+	* This function decrypts a file
+	*/
+	public static function multiKeyEncrypt( $plainContent, array $publicKeys ) {
+	
+		$envKeys = array();
+	
+		if( openssl_seal( $plainContent, $sealed, $envKeys, $publicKeys ) ) {
+		
+			return array(
+				'keys' => $envKeys
+				, 'encrypted' => $sealed
+			);
+		
+		} else {
+		
+			return false;
+			
+		}
+	
+	}
+	
+	/**
+	* @brief Asymmetrically encrypt a file using multiple public keys
+	* @param string $plainContent content to be encrypted
+	* @returns string $plainContent decrypted string
+	* @note symmetricDecryptFileContent() can be used to decrypt files created using this method
+	*
+	* This function decrypts a file
+	*/
+	public static function multiKeyDecrypt( $encryptedContent, $envKey, $privateKey ) {
+	
+		if ( !$encryptedContent ) {
+		
+			return false;
+			
+		}
+		
+		if ( openssl_open( $encryptedContent, $plainContent, $envKey, $privateKey ) ) {
+		
+			return $plainContent;
+			
+		} else {
+		
+			\OC_Log::write( 'Encryption library', 'Decryption (asymmetric) of sealed content failed' , \OC_Log::ERROR );
+			
+			return false;
+			
+		}
+	
+	}
+	
+        /**
+         * @brief Asymetrically encrypt a string using a public key
+         * @returns encrypted file
+         */
+	public static function keyEncrypt( $plainContent, $publicKey ) {
+	
+		openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
+		
+		return $encryptedContent;
+	
+	}
+	
+        /**
+         * @brief Asymetrically decrypt a file using a private key
+         * @returns decrypted file
+         */
+	public static function keyDecrypt( $encryptedContent, $privatekey ) {
+	
+		openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
+		
+		return $plainContent;
+	
+	}
+
+        /**
+         * @brief Encrypts content symmetrically and generates keyfile asymmetrically
+         * @returns array containing catfile and new keyfile. 
+         * keys: data, key
+         * @note this method is a wrapper for combining other crypt class methods
+         */
+	public static function keyEncryptKeyfile( $plainContent, $publicKey ) {
+		
+		// Encrypt plain data, generate keyfile & encrypted file
+		$cryptedData = self::symmetricEncryptFileContentKeyfile( $plainContent );
+		
+		// Encrypt keyfile
+		$cryptedKey = self::keyEncrypt( $cryptedData['key'], $publicKey );
+		
+		return array( 'data' => $cryptedData['encrypted'], 'key' => $cryptedKey );
+		
+	}
+	
+        /**
+         * @brief Takes catfile, keyfile, and private key, and
+         * performs decryption
+         * @returns decrypted content
+         * @note this method is a wrapper for combining other crypt class methods
+         */
+	public static function keyDecryptKeyfile( $catfile, $keyfile, $privateKey ) {
+		
+		// Decrypt the keyfile with the user's private key
+		$decryptedKeyfile = self::keyDecrypt( $keyfile, $privateKey );
+		
+		// Decrypt the catfile symmetrically using the decrypted keyfile
+		$decryptedData = self::symmetricDecryptFileContent( $catfile, $decryptedKeyfile );
+		
+		return $decryptedData;
+		
+	}
+	
+	/**
+	* @brief Symmetrically encrypt a file by combining encrypted component data blocks
+	*/
+	public static function symmetricBlockEncryptFileContent( $plainContent, $key ) {
+	
+		$crypted = '';
+		
+		$remaining = $plainContent;
+		
+		$testarray = array();
+		
+		while( strlen( $remaining ) ) {
+		
+			//echo "\n\n\$block = ".substr( $remaining, 0, 6126 );
+		
+			// Encrypt a chunk of unencrypted data and add it to the rest
+			$block = self::symmetricEncryptFileContent( substr( $remaining, 0, 6126 ), $key );
+			
+			$padded = self::addPadding( $block );
+			
+			$crypted .= $block;
+			
+			$testarray[] = $block;
+			
+			// Remove the data already encrypted from remaining unencrypted data
+			$remaining = substr( $remaining, 6126 );
+		
+		}
+		
+		//echo "hags   ";
+		
+		//echo "\n\n\n\$crypted = $crypted\n\n\n";
+		
+		//print_r($testarray);
+		
+		return $crypted;
+
+	}
+
+
+	/**
+	* @brief Symmetrically decrypt a file by combining encrypted component data blocks
+	*/
+	public static function symmetricBlockDecryptFileContent( $crypted, $key ) {
+		
+		$decrypted = '';
+		
+		$remaining = $crypted;
+		
+		$testarray = array();
+		
+		while( strlen( $remaining ) ) {
+			
+			$testarray[] = substr( $remaining, 0, 8192 );
+		
+			// Decrypt a chunk of unencrypted data and add it to the rest
+			$decrypted .= self::symmetricDecryptFileContent( $remaining, $key );
+			
+			// Remove the data already encrypted from remaining unencrypted data
+			$remaining = substr( $remaining, 8192 );
+			
+		}
+		
+		//echo "\n\n\$testarray = "; print_r($testarray);
+		
+		return $decrypted;
+		
+	}
+	
+        /**
+         * @brief Generates a pseudo random initialisation vector
+         * @return String $iv generated IV
+         */
+	public static function generateIv() {
+		
+		if ( $random = openssl_random_pseudo_bytes( 12, $strong ) ) {
+		
+			if ( !$strong ) {
+			
+				// If OpenSSL indicates randomness is insecure, log error
+				\OC_Log::write( 'Encryption library', 'Insecure symmetric key was generated using openssl_random_pseudo_bytes()' , \OC_Log::WARN );
+			
+			}
+			
+			// We encode the iv purely for string manipulation 
+			// purposes - it gets decoded before use
+			$iv = base64_encode( $random );
+			
+			return $iv;
+			
+		} else {
+		
+			throw new Exception( 'Generating IV failed' );
+			
+		}
+		
+	}
+	
+        /**
+         * @brief Generate a pseudo random 1024kb ASCII key
+         * @returns $key Generated key
+         */
+	public static function generateKey() {
+		
+		// Generate key
+		if ( $key = base64_encode( openssl_random_pseudo_bytes( 183, $strong ) ) ) {
+		
+			if ( !$strong ) {
+			
+				// If OpenSSL indicates randomness is insecure, log error
+				throw new Exception ( 'Encryption library, Insecure symmetric key was generated using openssl_random_pseudo_bytes()' );
+			
+			}
+		
+			return $key;
+			
+		} else {
+		
+			return false;
+			
+		}
+		
+	}
+
+	public static function changekeypasscode($oldPassword, $newPassword) {
+
+		if(\OCP\User::isLoggedIn()){
+			$key = Keymanager::getPrivateKey( $user, $view );
+			if ( ($key = Crypt::symmetricDecryptFileContent($key,$oldpasswd)) ) {
+				if ( ($key = Crypt::symmetricEncryptFileContent($key, $newpasswd)) ) {
+					Keymanager::setPrivateKey($key);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	/**
+	 * @brief Get the blowfish encryption handeler for a key
+	 * @param $key string (optional)
+	 * @return Crypt_Blowfish blowfish object
+	 *
+	 * if the key is left out, the default handeler will be used
+	 */
+	public static function getBlowfish( $key = '' ) {
+	
+		if ( $key ) {
+		
+			return new \Crypt_Blowfish( $key );
+		
+		} else {
+		
+			return false;
+			
+		}
+		
+	}
+	
+	public static function legacyCreateKey( $passphrase ) {
+	
+		// Generate a random integer
+		$key = mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 ) . mt_rand( 10000, 99999 );
+
+		// Encrypt the key with the passphrase
+		$legacyEncKey = self::legacyEncrypt( $key, $passphrase );
+
+		return $legacyEncKey;
+	
+	}
+	
+	/**
+	 * @brief encrypts content using legacy blowfish system
+	 * @param $content the cleartext message you want to encrypt
+	 * @param $key the encryption key (optional)
+	 * @returns encrypted content
+	 *
+	 * This function encrypts an content
+	 */
+	public static function legacyEncrypt( $content, $passphrase = '' ) {
+	
+		$bf = self::getBlowfish( $passphrase );
+		
+		return $bf->encrypt( $content );
+		
+	}
+	
+	/**
+	* @brief decrypts content using legacy blowfish system
+	* @param $content the cleartext message you want to decrypt
+	* @param $key the encryption key (optional)
+	* @returns cleartext content
+	*
+	* This function decrypts an content
+	*/
+	public static function legacyDecrypt( $content, $passphrase = '' ) {
+		
+		$bf = self::getBlowfish( $passphrase );
+		
+		$decrypted = $bf->decrypt( $content );
+		
+		$trimmed = rtrim( $decrypted, "\0" );
+		
+		return $trimmed;
+		
+	}
+	
+	public static function legacyKeyRecryptKeyfile( $legacyEncryptedContent, $legacyPassphrase, $publicKey, $newPassphrase ) {
+	
+		$decrypted = self::legacyDecrypt( $legacyEncryptedContent, $legacyPassphrase );
+	
+		$recrypted = self::keyEncryptKeyfile( $decrypted, $publicKey );
+		
+		return $recrypted;
+	
+	}
+	
+	/**
+	* @brief Re-encryptes a legacy blowfish encrypted file using AES with integrated IV
+	* @param $legacyContent the legacy encrypted content to re-encrypt
+	* @returns cleartext content
+	*
+	* This function decrypts an content
+	*/
+	public static function legacyRecrypt( $legacyContent, $legacyPassphrase, $newPassphrase ) {
+		
+		# TODO: write me
+	
+	}
+	
+}
+
+?>
\ No newline at end of file
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
deleted file mode 100644
index d516c0c21b22904d8bca4779787bc7a39c1adfdf..0000000000000000000000000000000000000000
--- a/apps/files_encryption/lib/cryptstream.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991@gmail.com
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * transparently encrypted filestream
- *
- * you can use it as wrapper around an existing stream by setting
- * OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream)
- * and then fopen('crypt://streams/foo');
- */
-
-class OC_CryptStream{
-	public static $sourceStreams=array();
-	private $source;
-	private $path;
-	private $meta=array();//header/meta for source stream
-	private $writeCache;
-	private $size;
-	private static $rootView;
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		if ( ! self::$rootView) {
-			self::$rootView=new OC_FilesystemView('');
-		}
-		$path=str_replace('crypt://', '', $path);
-		if (dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) {
-			$this->source=self::$sourceStreams[basename($path)]['stream'];
-			$this->path=self::$sourceStreams[basename($path)]['path'];
-			$this->size=self::$sourceStreams[basename($path)]['size'];
-		} else {
-			$this->path=$path;
-			if ($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') {
-				$this->size=0;
-			} else {
-				$this->size=self::$rootView->filesize($path, $mode);
-			}
-			OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
-			$this->source=self::$rootView->fopen($path, $mode);
-			OC_FileProxy::$enabled=true;
-			if ( ! is_resource($this->source)) {
-				OCP\Util::writeLog('files_encryption', 'failed to open '.$path, OCP\Util::ERROR);
-			}
-		}
-		if (is_resource($this->source)) {
-			$this->meta=stream_get_meta_data($this->source);
-		}
-		return is_resource($this->source);
-	}
-
-	public function stream_seek($offset, $whence=SEEK_SET) {
-		$this->flush();
-		fseek($this->source, $offset, $whence);
-	}
-
-	public function stream_tell() {
-		return ftell($this->source);
-	}
-
-	public function stream_read($count) {
-		//$count will always be 8192 https://bugs.php.net/bug.php?id=21641
-		//This makes this function a lot simpler but will breake everything the moment it's fixed
-		$this->writeCache='';
-		if ($count!=8192) {
-			OCP\Util::writeLog('files_encryption',
-							   'php bug 21641 no longer holds, decryption will not work',
-							   OCP\Util::FATAL);
-			die();
-		}
-		$pos=ftell($this->source);
-		$data=fread($this->source, 8192);
-		if (strlen($data)) {
-			$result=OC_Crypt::decrypt($data);
-		} else {
-			$result='';
-		}
-		$length=$this->size-$pos;
-		if ($length<8192) {
-			$result=substr($result, 0, $length);
-		}
-		return $result;
-	}
-
-	public function stream_write($data) {
-		$length=strlen($data);
-		$currentPos=ftell($this->source);
-		if ($this->writeCache) {
-			$data=$this->writeCache.$data;
-			$this->writeCache='';
-		}
-		if ($currentPos%8192!=0) {
-			//make sure we always start on a block start
-			fseek($this->source, -($currentPos%8192), SEEK_CUR);
-			$encryptedBlock=fread($this->source, 8192);
-			fseek($this->source, -($currentPos%8192), SEEK_CUR);
-			$block=OC_Crypt::decrypt($encryptedBlock);
-			$data=substr($block, 0, $currentPos%8192).$data;
-			fseek($this->source, -($currentPos%8192), SEEK_CUR);
-		}
-		$currentPos=ftell($this->source);
-		while ($remainingLength=strlen($data)>0) {
-			if ($remainingLength<8192) {
-				$this->writeCache=$data;
-				$data='';
-			} else {
-				$encrypted=OC_Crypt::encrypt(substr($data, 0, 8192));
-				fwrite($this->source, $encrypted);
-				$data=substr($data, 8192);
-			}
-		}
-		$this->size=max($this->size, $currentPos+$length);
-		return $length;
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		switch($option) {
-			case STREAM_OPTION_BLOCKING:
-				stream_set_blocking($this->source, $arg1);
-				break;
-			case STREAM_OPTION_READ_TIMEOUT:
-				stream_set_timeout($this->source, $arg1, $arg2);
-				break;
-			case STREAM_OPTION_WRITE_BUFFER:
-				stream_set_write_buffer($this->source, $arg1, $arg2);
-		}
-	}
-
-	public function stream_stat() {
-		return fstat($this->source);
-	}
-
-	public function stream_lock($mode) {
-		flock($this->source, $mode);
-	}
-
-	public function stream_flush() {
-		return fflush($this->source);
-	}
-
-	public function stream_eof() {
-		return feof($this->source);
-	}
-
-	private function flush() {
-		if ($this->writeCache) {
-			$encrypted=OC_Crypt::encrypt($this->writeCache);
-			fwrite($this->source, $encrypted);
-			$this->writeCache='';
-		}
-	}
-
-	public function stream_close() {
-		$this->flush();
-		if ($this->meta['mode']!='r' and $this->meta['mode']!='rb') {
-			OC_FileCache::put($this->path, array('encrypted'=>true, 'size'=>$this->size), '');
-		}
-		return fclose($this->source);
-	}
-}
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
new file mode 100755
index 0000000000000000000000000000000000000000..706e1c2661e6a263cac03875bd948fb93c67a544
--- /dev/null
+++ b/apps/files_encryption/lib/keymanager.php
@@ -0,0 +1,365 @@
+<?php
+/***
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2012 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\Encryption;
+
+/**
+ * @brief Class to manage storage and retrieval of encryption keys
+ * @note Where a method requires a view object, it's root must be '/'
+ */
+class Keymanager {
+	
+	# TODO: make all dependencies (including static classes) explicit, such as ocfsview objects, by adding them as method arguments (dependency injection)
+		
+	/**
+	 * @brief retrieve the ENCRYPTED private key from a user
+	 * 
+	 * @return string private key or false
+	 * @note the key returned by this method must be decrypted before use
+	 */
+	public static function getPrivateKey( \OC_FilesystemView $view, $user ) {
+	
+		$path =  '/' . $user . '/' . 'files_encryption' . '/' . $user.'.private.key';
+		
+		$key = $view->file_get_contents( $path );
+		
+		return $key;
+	}
+
+	/**
+	 * @brief retrieve public key for a specified user
+	 * @return string public key or false
+	 */
+	public static function getPublicKey( \OC_FilesystemView $view, $userId ) {
+		
+		return $view->file_get_contents( '/public-keys/' . '/' . $userId . '.public.key' );
+		
+	}
+	
+	/**
+	 * @brief retrieve both keys from a user (private and public)
+	 * @return array keys: privateKey, publicKey
+	 */
+	public static function getUserKeys( \OC_FilesystemView $view, $userId ) {
+	
+		return array(
+			'publicKey' => self::getPublicKey( $view, $userId )
+			, 'privateKey' => self::getPrivateKey( $view, $userId )
+		);
+	
+	}
+	
+	/**
+	 * @brief Retrieve public keys of all users with access to a file
+	 * @param string $path Path to file
+	 * @return array of public keys for the given file
+	 * @note Checks that the sharing app is enabled should be performed 
+	 * by client code, that isn't checked here
+	 */
+	public static function getPublicKeys( \OC_FilesystemView $view, $userId, $filePath ) {
+		
+		$path = ltrim( $path, '/' );
+		
+		$filepath = '/' . $userId . '/files/' . $filePath;
+		
+		// Check if sharing is enabled
+		if ( OC_App::isEnabled( 'files_sharing' ) ) {
+			
+// 			// Check if file was shared with other users
+// 			$query = \OC_DB::prepare( "
+// 				SELECT 
+// 					uid_owner
+// 					, source
+// 					, target
+// 					, uid_shared_with 
+// 				FROM 
+// 					`*PREFIX*sharing` 
+// 				WHERE 
+// 					( target = ? AND uid_shared_with = ? ) 
+// 					OR source = ? 
+// 			" );
+// 			
+// 			$result = $query->execute( array ( $filepath, $userId, $filepath ) );
+// 
+// 			$users = array();
+// 
+// 			if ( $row = $result->fetchRow() ) 
+// {
+// 				$source = $row['source'];
+// 				$owner = $row['uid_owner'];
+// 				$users[] = $owner;
+// 				// get the uids of all user with access to the file
+// 				$query = \OC_DB::prepare( "SELECT source, uid_shared_with FROM `*PREFIX*sharing` WHERE source = ?" );
+// 				$result = $query->execute( array ($source));
+// 				while ( ($row = $result->fetchRow()) ) {
+// 					$users[] = $row['uid_shared_with'];
+// 
+// 				}
+// 
+// 			}
+		
+		} else {
+		
+			// check if it is a file owned by the user and not shared at all
+			$userview = new \OC_FilesystemView( '/'.$userId.'/files/' );
+			
+			if ( $userview->file_exists( $path ) ) {
+			
+				$users[] = $userId;
+				
+			}
+			
+		}
+		
+		$view = new \OC_FilesystemView( '/public-keys/' );
+		
+		$keylist = array();
+		
+		$count = 0;
+		
+		foreach ( $users as $user ) {
+		
+			$keylist['key'.++$count] = $view->file_get_contents( $user.'.public.key' );
+			
+		}
+		
+		return $keylist;
+		
+	}
+	
+	/**
+	 * @brief retrieve keyfile for an encrypted file
+	 * @param string file name
+	 * @return string file key or false
+	 * @note The keyfile returned is asymmetrically encrypted. Decryption
+	 * of the keyfile must be performed by client code
+	 */
+	public static function getFileKey( \OC_FilesystemView $view, $userId, $filePath ) {
+		
+		$filePath_f = ltrim( $filePath, '/' );
+
+// 		// update $keypath and $userId if path point to a file shared by someone else
+// 		$query = \OC_DB::prepare( "SELECT uid_owner, source, target FROM `*PREFIX*sharing` WHERE target = ? AND uid_shared_with = ?" );
+// 		
+// 		$result = $query->execute( array ('/'.$userId.'/files/'.$keypath, $userId));
+// 		
+// 		if ($row = $result->fetchRow()) {
+// 		
+// 			$keypath = $row['source'];
+// 			$keypath_parts = explode( '/', $keypath );
+// 			$userId = $keypath_parts[1];
+// 			$keypath = str_replace( '/' . $userId . '/files/', '', $keypath );
+// 			
+// 		}
+
+		return $view->file_get_contents( '/' . $userId . '/files_encryption/keyfiles/' . $filePath_f . '.key' );
+		
+	}
+	
+	/**
+	 * @brief retrieve file encryption key
+	 *
+	 * @param string file name
+	 * @return string file key or false
+	 */
+	public static function deleteFileKey( $path, $staticUserClass = 'OCP\User' ) {
+		
+		$keypath = ltrim( $path, '/' );
+		$user = $staticUserClass::getUser();
+
+		// update $keypath and $user if path point to a file shared by someone else
+// 		$query = \OC_DB::prepare( "SELECT uid_owner, source, target FROM `*PREFIX*sharing` WHERE target = ? AND uid_shared_with = ?" );
+// 		
+// 		$result = $query->execute( array ('/'.$user.'/files/'.$keypath, $user));
+// 		
+// 		if ($row = $result->fetchRow()) {
+// 		
+// 			$keypath = $row['source'];
+// 			$keypath_parts = explode( '/', $keypath );
+// 			$user = $keypath_parts[1];
+// 			$keypath = str_replace( '/' . $user . '/files/', '', $keypath );
+// 			
+// 		}
+		
+		$view = new \OC_FilesystemView('/'.$user.'/files_encryption/keyfiles/');
+		
+		return $view->unlink( $keypath . '.key' );
+		
+	}
+	
+	/**
+	 * @brief store private key from the user
+	 * @param string key
+	 * @return bool
+	 * @note Encryption of the private key must be performed by client code
+	 * as no encryption takes place here
+	 */
+	public static function setPrivateKey( $key ) {
+		
+		$user = \OCP\User::getUser();
+		
+		$view = new \OC_FilesystemView( '/' . $user . '/files_encryption' );
+		
+		\OC_FileProxy::$enabled = false;
+		
+		if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
+		
+		return $view->file_put_contents( $user . '.private.key', $key );
+		
+		\OC_FileProxy::$enabled = true;
+		
+	}
+	
+	/**
+	 * @brief store private keys from the user
+	 *
+	 * @param string privatekey
+	 * @param string publickey
+	 * @return bool true/false
+	 */
+	public static function setUserKeys($privatekey, $publickey) {
+	
+		return (self::setPrivateKey($privatekey) && self::setPublicKey($publickey));
+	
+	}
+	
+	/**
+	 * @brief store public key of the user
+	 *
+	 * @param string key
+	 * @return bool true/false
+	 */
+	public static function setPublicKey( $key ) {
+		
+		$view = new \OC_FilesystemView( '/public-keys' );
+		
+		\OC_FileProxy::$enabled = false;
+		
+		if ( !$view->file_exists( '' ) ) $view->mkdir( '' );
+		
+		return $view->file_put_contents( \OCP\User::getUser() . '.public.key', $key );
+		
+		\OC_FileProxy::$enabled = true;
+		
+	}
+	
+	/**
+	 * @brief store file encryption key
+	 *
+	 * @param string $path relative path of the file, including filename
+	 * @param string $key
+	 * @return bool true/false
+	 * @note The keyfile is not encrypted here. Client code must 
+	 * asymmetrically encrypt the keyfile before passing it to this method
+	 */
+	public static function setFileKey( $path, $key, $view = Null, $dbClassName = '\OC_DB') {
+
+		$targetPath = ltrim(  $path, '/'  );
+		$user = \OCP\User::getUser();
+		
+// 		// update $keytarget and $user if key belongs to a file shared by someone else
+// 		$query = $dbClassName::prepare( "SELECT uid_owner, source, target FROM `*PREFIX*sharing` WHERE target = ? AND uid_shared_with = ?" );
+// 		
+// 		$result = $query->execute(  array ( '/'.$user.'/files/'.$targetPath, $user ) );
+// 		
+// 		if ( $row = $result->fetchRow(  ) ) {
+// 		
+// 			$targetPath = $row['source'];
+// 			
+// 			$targetPath_parts = explode( '/', $targetPath );
+// 			
+// 			$user = $targetPath_parts[1];
+// 
+// 			$rootview = new \OC_FilesystemView( '/' );
+// 			
+// 			if ( ! $rootview->is_writable( $targetPath ) ) {
+// 			
+// 				\OC_Log::write( 'Encryption library', "File Key not updated because you don't have write access for the corresponding file", \OC_Log::ERROR );
+// 				
+// 				return false;
+// 				
+// 			}
+// 			
+// 			$targetPath = str_replace( '/'.$user.'/files/', '', $targetPath );
+// 			
+// 			//TODO: check for write permission on shared file once the new sharing API is in place
+// 			
+// 		}
+		
+		$path_parts = pathinfo( $targetPath );
+		
+		if ( !$view ) {
+		
+			$view = new \OC_FilesystemView( '/' );
+			
+		}
+		
+		$view->chroot( '/' . $user . '/files_encryption/keyfiles' );
+		
+		// If the file resides within a subdirectory, create it
+		if ( 
+		isset( $path_parts['dirname'] )
+		&& ! $view->file_exists( $path_parts['dirname'] ) 
+		) {
+		
+			$view->mkdir( $path_parts['dirname'] );
+			
+		}
+		
+		// Save the keyfile in parallel directory
+		return $view->file_put_contents( '/' . $targetPath . '.key', $key );
+		
+	}
+	
+	/**
+	 * @brief change password of private encryption key
+	 *
+	 * @param string $oldpasswd old password
+	 * @param string $newpasswd new password
+	 * @return bool true/false
+	 */
+	public static function changePasswd($oldpasswd, $newpasswd) {
+		
+		if ( \OCP\User::checkPassword(\OCP\User::getUser(), $newpasswd) ) {
+			return Crypt::changekeypasscode($oldpasswd, $newpasswd);
+		}
+		return false;
+		
+	}
+	
+	/**
+	 * @brief Fetch the legacy encryption key from user files
+	 * @param string $login used to locate the legacy key
+	 * @param string $passphrase used to decrypt the legacy key
+	 * @return true / false
+	 *
+	 * if the key is left out, the default handeler will be used
+	 */
+	public function getLegacyKey() {
+		
+		$user = \OCP\User::getUser();
+		$view = new \OC_FilesystemView( '/' . $user );
+		return $view->file_get_contents( 'encryption.key' );
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index e8dbd95c29d2a242c9a422194e9500d3c21b8c7c..52f47dba2940faacfa6625c744695434a9282377 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -3,8 +3,9 @@
 /**
 * ownCloud
 *
-* @author Robin Appelman
-* @copyright 2011 Robin Appelman icewind1991@gmail.com
+* @author Sam Tuke, Robin Appelman
+* @copyright 2012 Sam Tuke samtuke@owncloud.com, Robin Appelman 
+* icewind1991@gmail.com
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
@@ -21,111 +22,267 @@
 *
 */
 
-/**
- * transparent encryption
- */
+namespace OCA\Encryption;
 
-class OC_FileProxy_Encryption extends OC_FileProxy{
-	private static $blackList=null; //mimetypes blacklisted from encryption
-	private static $enableEncryption=null;
+class Proxy extends \OC_FileProxy {
 
+	private static $blackList = null; //mimetypes blacklisted from encryption
+	
+	private static $enableEncryption = null;
+	
 	/**
-	 * check if a file should be encrypted during write
+	 * Check if a file requires encryption
 	 * @param string $path
 	 * @return bool
+	 *
+	 * Tests if server side encryption is enabled, and file is allowed by blacklists
 	 */
-	private static function shouldEncrypt($path) {
-		if (is_null(self::$enableEncryption)) {
-			self::$enableEncryption=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
+	private static function shouldEncrypt( $path ) {
+		
+		if ( is_null( self::$enableEncryption ) ) {
+		
+			if ( 
+			\OCP\Config::getAppValue( 'files_encryption', 'enable_encryption', 'true' ) == 'true' 
+			&& Crypt::mode() == 'server' 
+			) {
+			
+				self::$enableEncryption = true;
+			
+			} else {
+				
+				self::$enableEncryption = false;
+			
+			}
+			
 		}
-		if ( ! self::$enableEncryption) {
+		
+		if ( !self::$enableEncryption ) {
+		
 			return false;
+			
 		}
-		if (is_null(self::$blackList)) {
-			self::$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
-																  'type_blacklist',
-																  'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+		
+		if ( is_null(self::$blackList ) ) {
+		
+			self::$blackList = explode(',', \OCP\Config::getAppValue( 'files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+			
 		}
-		if (self::isEncrypted($path)) {
+		
+		if ( Crypt::isEncryptedContent( $path ) ) {
+		
 			return true;
+			
 		}
-		$extension=substr($path, strrpos($path, '.')+1);
-		if (array_search($extension, self::$blackList)===false) {
+		
+		$extension = substr( $path, strrpos( $path,'.' ) +1 );
+		
+		if ( array_search( $extension, self::$blackList ) === false ){
+		
 			return true;
+			
 		}
+		
+		return false;
 	}
-
-	/**
-	 * check if a file is encrypted
-	 * @param string $path
-	 * @return bool
-	 */
-	private static function isEncrypted($path) {
-		$metadata=OC_FileCache_Cached::get($path, '');
-		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
-	}
-
-	public function preFile_put_contents($path,&$data) {
-		if (self::shouldEncrypt($path)) {
-			if ( ! is_resource($data)) {//stream put contents should have been converter to fopen
-				$size=strlen($data);
-				$data=OC_Crypt::blockEncrypt($data);
-				OC_FileCache::put($path, array('encrypted'=>true,'size'=>$size), '');
+	
+	public function preFile_put_contents( $path, &$data ) {
+		
+		if ( self::shouldEncrypt( $path ) ) {
+		
+			if ( !is_resource( $data ) ) { //stream put contents should have been converted to fopen
+			
+				$userId = \OCP\USER::getUser();
+				
+				$rootView = new \OC_FilesystemView( '/' );
+			
+				// Set the filesize for userland, before encrypting
+				$size = strlen( $data );
+				
+				// Disable encryption proxy to prevent recursive calls
+				\OC_FileProxy::$enabled = false;
+				
+				// Encrypt plain data and fetch key
+				$encrypted = Crypt::keyEncryptKeyfile( $data, Keymanager::getPublicKey( $rootView, $userId ) );
+				
+				// Replace plain content with encrypted content by reference
+				$data = $encrypted['data'];
+				
+				$filePath = explode( '/', $path );
+				
+				$filePath = array_slice( $filePath, 3 );
+				
+				$filePath = '/' . implode( '/', $filePath );
+				
+				# TODO: make keyfile dir dynamic from app config
+				$view = new \OC_FilesystemView( '/' . $userId . '/files_encryption/keyfiles' );
+				
+				// Save keyfile for newly encrypted file in parallel directory tree
+				Keymanager::setFileKey( $filePath, $encrypted['key'], $view, '\OC_DB' );
+				
+				// Update the file cache with file info
+				\OC_FileCache::put( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
+				
+				// Re-enable proxy - our work is done
+				\OC_FileProxy::$enabled = true;
+				
 			}
 		}
+		
 	}
+	
+	/**
+	 * @param string $path Path of file from which has been read
+	 * @param string $data Data that has been read from file
+	 */
+	public function postFile_get_contents( $path, $data ) {
+	
+		# TODO: Use dependency injection to add required args for view and user etc. to this method
+
+		// Disable encryption proxy to prevent recursive calls
+		\OC_FileProxy::$enabled = false;
+		
+		// If data is a catfile
+		if ( 
+		Crypt::mode() == 'server' 
+		&& Crypt::isEncryptedContent( $data ) 
+		) {
+			
+			$split = explode( '/', $path );
+			
+			$filePath = array_slice( $split, 3 );
+			
+			$filePath = '/' . implode( '/', $filePath );
+			
+			//$cached = \OC_FileCache_Cached::get( $path, '' );
+			
+			$view = new \OC_FilesystemView( '' );
+			
+			$userId = \OCP\USER::getUser();
+			
+			$encryptedKeyfile = Keymanager::getFileKey( $view, $userId, $filePath );
 
-	public function postFile_get_contents($path, $data) {
-		if (self::isEncrypted($path)) {
-			$cached=OC_FileCache_Cached::get($path, '');
-			$data=OC_Crypt::blockDecrypt($data, '', $cached['size']);
+			$session = new Session();
+			
+			$decrypted = Crypt::keyDecryptKeyfile( $data, $encryptedKeyfile, $session->getPrivateKey( $split[1] ) );
+			
+		} elseif (
+		Crypt::mode() == 'server' 
+		&& isset( $_SESSION['legacyenckey'] )
+		&& Crypt::isEncryptedMeta( $path ) 
+		) {
+			
+			$decrypted = Crypt::legacyDecrypt( $data, $_SESSION['legacyenckey'] );
+			
 		}
-		return $data;
+		
+		\OC_FileProxy::$enabled = true;
+		
+		if ( ! isset( $decrypted ) ) {
+		
+			$decrypted = $data;
+			
+		}
+		
+		return $decrypted;
+		
 	}
-
-	public function postFopen($path,&$result) {
-		if ( ! $result) {
+	
+	public function postFopen( $path, &$result ){
+	
+		if ( !$result ) {
+		
 			return $result;
+			
 		}
-		$meta=stream_get_meta_data($result);
-		if (self::isEncrypted($path)) {
-			fclose($result);
-			$result=fopen('crypt://'.$path, $meta['mode']);
-		} elseif (self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
-			if (OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
-				//first encrypt the target file so we don't end up with a half encrypted file
-				OCP\Util::writeLog('files_encryption', 'Decrypting '.$path.' before writing', OCP\Util::DEBUG);
-				$tmp=fopen('php://temp');
-				OCP\Files::streamCopy($result, $tmp);
-				fclose($result);
-				OC_Filesystem::file_put_contents($path, $tmp);
-				fclose($tmp);
+		
+		// Reformat path for use with OC_FSV
+		$path_split = explode( '/', $path );
+		$path_f = implode( array_slice( $path_split, 3 ) );
+		
+		// Disable encryption proxy to prevent recursive calls
+		\OC_FileProxy::$enabled = false;
+		
+		$meta = stream_get_meta_data( $result );
+		
+		$view = new \OC_FilesystemView( '' );
+		
+		$util = new Util( $view, \OCP\USER::getUser());
+		
+		// If file is already encrypted, decrypt using crypto protocol
+		if ( 
+		Crypt::mode() == 'server' 
+		&& $util->isEncryptedPath( $path ) 
+		) {
+			
+			// Close the original encrypted file
+			fclose( $result );
+			
+			// Open the file using the crypto stream wrapper 
+			// protocol and let it do the decryption work instead
+			$result = fopen( 'crypt://' . $path_f, $meta['mode'] );
+			
+			
+		} elseif ( 
+		self::shouldEncrypt( $path ) 
+		and $meta ['mode'] != 'r' 
+		and $meta['mode'] != 'rb' 
+		) {
+		// If the file is not yet encrypted, but should be 
+		// encrypted when it's saved (it's not read only)
+		
+		// NOTE: this is the case for new files saved via WebDAV
+		
+			if ( 
+			$view->file_exists( $path ) 
+			and $view->filesize( $path ) > 0 
+			) {
+				$x = $view->file_get_contents( $path );
+				
+				$tmp = tmpfile();
+				
+// 				// Make a temporary copy of the original file
+// 				\OCP\Files::streamCopy( $result, $tmp );
+// 				
+// 				// Close the original stream, we'll return another one
+// 				fclose( $result );
+// 				
+// 				$view->file_put_contents( $path_f, $tmp );
+// 				
+// 				fclose( $tmp );
+			
 			}
-			$result=fopen('crypt://'.$path, $meta['mode']);
+			
+			$result = fopen( 'crypt://'.$path_f, $meta['mode'] );
+		
 		}
+		
+		// Re-enable the proxy
+		\OC_FileProxy::$enabled = true;
+		
 		return $result;
+	
 	}
 
-	public function postGetMimeType($path, $mime) {
-		if (self::isEncrypted($path)) {
-			$mime=OCP\Files::getMimeType('crypt://'.$path, 'w');
+	public function postGetMimeType($path,$mime){
+		if( Crypt::isEncryptedContent($path)){
+			$mime = \OCP\Files::getMimeType('crypt://'.$path,'w');
 		}
 		return $mime;
 	}
 
-	public function postStat($path, $data) {
-		if (self::isEncrypted($path)) {
-			$cached=OC_FileCache_Cached::get($path, '');
+	public function postStat($path,$data){
+		if( Crypt::isEncryptedContent($path)){
+			$cached=  \OC_FileCache_Cached::get($path,'');
 			$data['size']=$cached['size'];
 		}
 		return $data;
 	}
 
-	public function postFileSize($path, $size) {
-		if (self::isEncrypted($path)) {
-			$cached=OC_FileCache_Cached::get($path, '');
+	public function postFileSize($path,$size){
+		if( Crypt::isEncryptedContent($path)){
+			$cached = \OC_FileCache_Cached::get($path,'');
 			return  $cached['size'];
-		} else {
+		}else{
 			return $size;
 		}
 	}
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
new file mode 100644
index 0000000000000000000000000000000000000000..85d533fde7a6d7bdff1b047d4e6649af82657229
--- /dev/null
+++ b/apps/files_encryption/lib/session.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Sam Tuke
+ * @copyright 2012 Sam Tuke samtuke@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\Encryption;
+
+/**
+ * Class for handling encryption related session data
+ */
+
+class Session {
+
+	/**
+	 * @brief Sets user id for session and triggers emit
+	 * @return bool
+	 *
+	 */
+	public function setPrivateKey( $privateKey, $userId ) {
+	
+		$_SESSION['privateKey'] = $privateKey;
+		
+		return true;
+		
+	}
+	
+	/**
+	 * @brief Gets user id for session and triggers emit
+	 * @returns string $privateKey The user's plaintext private key
+	 *
+	 */
+	public function getPrivateKey( $userId ) {
+	
+		if ( 
+		isset( $_SESSION['privateKey'] )
+		&& !empty( $_SESSION['privateKey'] )
+		) {
+		
+			return $_SESSION['privateKey'];
+		
+		} else {
+		
+			return false;
+			
+		}
+		
+	}
+
+}
\ No newline at end of file
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
new file mode 100644
index 0000000000000000000000000000000000000000..f482e2d75ac13480f293564291bbc8b548aa4ca6
--- /dev/null
+++ b/apps/files_encryption/lib/stream.php
@@ -0,0 +1,464 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Robin Appelman
+ * @copyright 2012 Sam Tuke <samtuke@owncloud.com>, 2011 Robin Appelman 
+ * <icewind1991@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * 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/>.
+ *
+ */
+
+/**
+ * transparently encrypted filestream
+ *
+ * you can use it as wrapper around an existing stream by setting CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream)
+ * and then fopen('crypt://streams/foo');
+ */
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Provides 'crypt://' stream wrapper protocol.
+ * @note We use a stream wrapper because it is the most secure way to handle 
+ * decrypted content transfers. There is no safe way to decrypt the entire file
+ * somewhere on the server, so we have to encrypt and decrypt blocks on the fly.
+ * @note Paths used with this protocol MUST BE RELATIVE. Use URLs like:
+ * crypt://filename, or crypt://subdirectory/filename, NOT 
+ * crypt:///home/user/owncloud/data. Otherwise keyfiles will be put in 
+ * [owncloud]/data/user/files_encryption/keyfiles/home/user/owncloud/data and 
+ * will not be accessible to other methods.
+ * @note Data read and written must always be 8192 bytes long, as this is the 
+ * buffer size used internally by PHP. The encryption process makes the input 
+ * data longer, and input is chunked into smaller pieces in order to result in 
+ * a 8192 encrypted block size.
+ */
+class Stream {
+
+	public static $sourceStreams = array();
+
+	# TODO: make all below properties private again once unit testing is configured correctly
+	public $rawPath; // The raw path received by stream_open
+	public $path_f; // The raw path formatted to include username and data directory
+	private $userId;
+	private $handle; // Resource returned by fopen
+	private $path;
+	private $readBuffer; // For streams that dont support seeking
+	private $meta = array(); // Header / meta for source stream
+	private $count;
+	private $writeCache;
+	public $size;
+	private $publicKey;
+	private $keyfile;
+	private $encKeyfile;
+	private static $view; // a fsview object set to user dir
+	private $rootView; // a fsview object set to '/'
+
+	public function stream_open( $path, $mode, $options, &$opened_path ) {
+		
+		// Get access to filesystem via filesystemview object
+		if ( !self::$view ) {
+
+			self::$view = new \OC_FilesystemView( $this->userId . '/' );
+
+		}
+		
+		// Set rootview object if necessary
+		if ( ! $this->rootView ) {
+
+			$this->rootView = new \OC_FilesystemView( $this->userId . '/' );
+
+		}
+		
+		$this->userId = \OCP\User::getUser();
+		
+		// Get the bare file path
+		$path = str_replace( 'crypt://', '', $path );
+		
+		$this->rawPath = $path;
+		
+		$this->path_f = $this->userId . '/files/' . $path;
+		
+		if ( 
+		dirname( $path ) == 'streams' 
+		and isset( self::$sourceStreams[basename( $path )] ) 
+		) {
+		
+			// Is this just for unit testing purposes?
+
+			$this->handle = self::$sourceStreams[basename( $path )]['stream'];
+
+			$this->path = self::$sourceStreams[basename( $path )]['path'];
+
+			$this->size = self::$sourceStreams[basename( $path )]['size'];
+
+		} else {
+
+			if ( 
+			$mode == 'w' 
+			or $mode == 'w+' 
+			or $mode == 'wb' 
+			or $mode == 'wb+' 
+			) {
+
+				$this->size = 0;
+
+			} else {
+				
+				
+				
+				$this->size = self::$view->filesize( $this->path_f, $mode );
+				
+				//$this->size = filesize( $path );
+				
+			}
+
+			// Disable fileproxies so we can open the source file without recursive encryption
+			\OC_FileProxy::$enabled = false;
+
+			//$this->handle = fopen( $path, $mode );
+			
+			$this->handle = self::$view->fopen( $this->path_f, $mode );
+			
+			\OC_FileProxy::$enabled = true;
+
+			if ( !is_resource( $this->handle ) ) {
+
+				\OCP\Util::writeLog( 'files_encryption', 'failed to open '.$path, \OCP\Util::ERROR );
+
+			}
+
+		}
+
+		if ( is_resource( $this->handle ) ) {
+
+			$this->meta = stream_get_meta_data( $this->handle );
+
+		}
+
+		return is_resource( $this->handle );
+
+	}
+	
+	public function stream_seek( $offset, $whence = SEEK_SET ) {
+	
+		$this->flush();
+		
+		fseek( $this->handle, $offset, $whence );
+		
+	}
+	
+	public function stream_tell() {
+		return ftell($this->handle);
+	}
+	
+	public function stream_read( $count ) {
+	
+		$this->writeCache = '';
+
+		if ( $count != 8192 ) {
+			
+			// $count will always be 8192 https://bugs.php.net/bug.php?id=21641
+			// This makes this function a lot simpler, but will break this class if the above 'bug' gets 'fixed'
+			\OCP\Util::writeLog( 'files_encryption', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', OCP\Util::FATAL );
+
+			die();
+
+		}
+
+// 		$pos = ftell( $this->handle );
+// 
+		// Get the data from the file handle
+		$data = fread( $this->handle, 8192 );
+ 
+		if ( strlen( $data ) ) {
+			
+			$this->getKey();
+			
+			$result = Crypt::symmetricDecryptFileContent( $data, $this->keyfile );
+			
+		} else {
+
+			$result = '';
+
+		}
+
+// 		$length = $this->size - $pos;
+// 
+// 		if ( $length < 8192 ) {
+// 
+// 			$result = substr( $result, 0, $length );
+// 
+// 		}
+
+		return $result;
+
+	}
+	
+	/**
+	 * @brief Encrypt and pad data ready for writting to disk
+	 * @param string $plainData data to be encrypted
+	 * @param string $key key to use for encryption
+	 * @return encrypted data on success, false on failure
+	 */
+	public function preWriteEncrypt( $plainData, $key ) {
+		
+		// Encrypt data to 'catfile', which includes IV
+		if ( $encrypted = Crypt::symmetricEncryptFileContent( $plainData, $key ) ) {
+		
+			return $encrypted; 
+			
+		} else {
+		
+			return false;
+			
+		}
+		
+	}
+	
+	/**
+	 * @brief Get the keyfile for the current file, generate one if necessary
+	 * @param bool $generate if true, a new key will be generated if none can be found
+	 * @return bool true on key found and set, false on key not found and new key generated and set
+	 */
+	public function getKey() {
+		
+		// If a keyfile already exists for a file named identically to file to be written
+		if ( self::$view->file_exists( $this->userId . '/'. 'files_encryption' . '/' . 'keyfiles' . '/' . $this->rawPath . '.key' ) ) {
+		
+			# TODO: add error handling for when file exists but no keyfile
+			
+			// Fetch existing keyfile
+			$this->encKeyfile = Keymanager::getFileKey( $this->rootView, $this->userId, $this->rawPath );
+			
+			$this->getUser();
+			
+			$session = new Session();
+			
+			$privateKey = $session->getPrivateKey( $this->userId );
+			
+			$this->keyfile = Crypt::keyDecrypt( $this->encKeyfile, $privateKey );
+			
+			return true;
+			
+		} else {
+		
+			return false;
+		
+		}
+		
+	}
+	
+	public function getuser() {
+	
+		// Only get the user again if it isn't already set
+		if ( empty( $this->userId ) ) {
+	
+			# TODO: Move this user call out of here - it belongs elsewhere
+			$this->userId = \OCP\User::getUser();
+		
+		}
+		
+		# TODO: Add a method for getting the user in case OCP\User::
+		# getUser() doesn't work (can that scenario ever occur?)
+		
+	}
+	
+	/**
+	 * @brief Handle plain data from the stream, and write it in 8192 byte blocks
+	 * @param string $data data to be written to disk
+	 * @note the data will be written to the path stored in the stream handle, set in stream_open()
+	 * @note $data is only ever be a maximum of 8192 bytes long. This is set by PHP internally. stream_write() is called multiple times in a loop on data larger than 8192 bytes
+	 * @note Because the encryption process used increases the length of $data, a writeCache is used to carry over data which would not fit in the required block size
+	 * @note Padding is added to each encrypted block to ensure that the resulting block is exactly 8192 bytes. This is removed during stream_read
+	 * @note PHP automatically updates the file pointer after writing data to reflect it's length. There is generally no need to update the poitner manually using fseek
+	 */
+	public function stream_write( $data ) {
+		
+		// Disable the file proxies so that encryption is not automatically attempted when the file is written to disk - we are handling that separately here and we don't want to get into an infinite loop
+		\OC_FileProxy::$enabled = false;
+		
+		// Get the length of the unencrypted data that we are handling
+		$length = strlen( $data );
+		
+		// So far this round, no data has been written
+		$written = 0;
+		
+		// Find out where we are up to in the writing of data to the file
+		$pointer = ftell( $this->handle );
+		
+		// Make sure the userId is set
+		$this->getuser();
+		
+		// Get / generate the keyfile for the file we're handling
+		// If we're writing a new file (not overwriting an existing one), save the newly generated keyfile
+		if ( ! $this->getKey() ) {
+		
+			$this->keyfile = Crypt::generateKey();
+			
+			$this->publicKey = Keymanager::getPublicKey( $this->rootView, $this->userId );
+			
+			$this->encKeyfile = Crypt::keyEncrypt( $this->keyfile, $this->publicKey );
+			
+			// Save the new encrypted file key
+			Keymanager::setFileKey( $this->rawPath, $this->encKeyfile, new \OC_FilesystemView( '/' ) );
+			
+			# TODO: move this new OCFSV out of here some how, use DI
+			
+		}
+
+		// If extra data is left over from the last round, make sure it is integrated into the next 6126 / 8192 block
+		if ( $this->writeCache ) {
+			
+			// Concat writeCache to start of $data
+			$data = $this->writeCache . $data;
+			
+			// Clear the write cache, ready for resuse - it has been flushed and its old contents processed
+			$this->writeCache = '';
+
+		}
+// 		
+// 		// Make sure we always start on a block start
+		if ( 0 != ( $pointer % 8192 ) ) { // if the current positoin of file indicator is not aligned to a 8192 byte block, fix it so that it is
+
+// 			fseek( $this->handle, - ( $pointer % 8192 ), SEEK_CUR );
+// 			
+// 			$pointer = ftell( $this->handle );
+// 
+// 			$unencryptedNewBlock = fread( $this->handle, 8192 );
+// 			
+// 			fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
+// 
+// 			$block = Crypt::symmetricDecryptFileContent( $unencryptedNewBlock, $this->keyfile );
+// 
+// 			$x =  substr( $block, 0, $currentPos % 8192 );
+// 
+// 			$data = $x . $data;
+// 			
+// 			fseek( $this->handle, - ( $currentPos % 8192 ), SEEK_CUR );
+// 
+		}
+
+// 		$currentPos = ftell( $this->handle );
+		
+// 		// While there still remains somed data to be processed & written
+		while( strlen( $data ) > 0 ) {
+// 			
+// 			// Remaining length for this iteration, not of the entire file (may be greater than 8192 bytes)
+// 			$remainingLength = strlen( $data );
+// 			
+// 			// If data remaining to be written is less than the size of 1 6126 byte block
+			if ( strlen( $data ) < 6126 ) {
+				
+				// Set writeCache to contents of $data
+				// The writeCache will be carried over to the next write round, and added to the start of $data to ensure that written blocks are always the correct length. If there is still data in writeCache after the writing round has finished, then the data will be written to disk by $this->flush().
+				$this->writeCache = $data;
+
+				// Clear $data ready for next round
+				$data = '';
+// 
+			} else {
+				
+				// Read the chunk from the start of $data
+				$chunk = substr( $data, 0, 6126 );
+				
+				$encrypted = $this->preWriteEncrypt( $chunk, $this->keyfile );
+				
+				// Write the data chunk to disk. This will be addended to the last data chunk if the file being handled totals more than 6126 bytes
+				fwrite( $this->handle, $encrypted );
+				
+				$writtenLen = strlen( $encrypted );
+				//fseek( $this->handle, $writtenLen, SEEK_CUR );
+
+				// Remove the chunk we just processed from $data, leaving only unprocessed data in $data var, for handling on the next round
+				$data = substr( $data, 6126 );
+
+			}
+		
+		}
+
+		$this->size = max( $this->size, $pointer + $length );
+		
+		return $length;
+
+	}
+
+
+	public function stream_set_option($option,$arg1,$arg2) {
+		switch($option) {
+			case STREAM_OPTION_BLOCKING:
+				stream_set_blocking($this->handle,$arg1);
+				break;
+			case STREAM_OPTION_READ_TIMEOUT:
+				stream_set_timeout($this->handle,$arg1,$arg2);
+				break;
+			case STREAM_OPTION_WRITE_BUFFER:
+				stream_set_write_buffer($this->handle,$arg1,$arg2);
+		}
+	}
+
+	public function stream_stat() {
+		return fstat($this->handle);
+	}
+	
+	public function stream_lock($mode) {
+		flock($this->handle,$mode);
+	}
+	
+	public function stream_flush() {
+	
+		return fflush($this->handle); // Not a typo: http://php.net/manual/en/function.fflush.php
+		
+	}
+
+	public function stream_eof() {
+		return feof($this->handle);
+	}
+
+	private function flush() {
+		
+		if ( $this->writeCache ) {
+			
+			// Set keyfile property for file in question
+			$this->getKey();
+			
+			$encrypted = $this->preWriteEncrypt( $this->writeCache, $this->keyfile );
+			
+			fwrite( $this->handle, $encrypted );
+			
+			$this->writeCache = '';
+		
+		}
+	
+	}
+
+	public function stream_close() {
+	
+		$this->flush();
+
+		if ( 
+		$this->meta['mode']!='r' 
+		and $this->meta['mode']!='rb' 
+		) {
+
+			\OC_FileCache::put( $this->path, array( 'encrypted' => true, 'size' => $this->size ), '' );
+
+		}
+
+		return fclose( $this->handle );
+
+	}
+
+}
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
new file mode 100644
index 0000000000000000000000000000000000000000..cd46d23108af1f884aafb28ea0cc444a267731dc
--- /dev/null
+++ b/apps/files_encryption/lib/util.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Sam Tuke, Frank Karlitschek
+ * @copyright 2012 Sam Tuke samtuke@owncloud.com, 
+ * Frank Karlitschek frank@owncloud.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * 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/>.
+ *
+ */
+
+// Todo:
+//  - Crypt/decrypt button in the userinterface
+//  - Setting if crypto should be on by default
+//  - Add a setting "DonÂ´t encrypt files larger than xx because of performance reasons"
+//  - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is encrypted (.encrypted extension)
+//  - Don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster
+//  - IMPORTANT! Check if the block lenght of the encrypted data stays the same
+
+namespace OCA\Encryption;
+
+/**
+ * @brief Class for utilities relating to encrypted file storage system
+ * @param $view OC_FilesystemView object, expected to have OC '/' as root path
+ * @param $client flag indicating status of client side encryption. Currently
+ * unused, likely to become obsolete shortly
+ */
+
+class Util {
+	
+	
+	# Web UI:
+	
+	## DONE: files created via web ui are encrypted
+	## DONE: file created & encrypted via web ui are readable in web ui
+	## DONE: file created & encrypted via web ui are readable via webdav
+	
+	
+	# WebDAV:
+	
+	## DONE: new data filled files added via webdav get encrypted
+	## DONE: new data filled files added via webdav are readable via webdav
+	## DONE: reading unencrypted files when encryption is enabled works via webdav
+	## DONE: files created & encrypted via web ui are readable via webdav
+	
+	
+	# Legacy support:
+	
+	## DONE: add method to check if file is encrypted using new system
+	## DONE: add method to check if file is encrypted using old system
+	## DONE: add method to fetch legacy key
+	## DONE: add method to decrypt legacy encrypted data
+	
+	## TODO: add method to encrypt all user files using new system
+	## TODO: add method to decrypt all user files using new system
+	## TODO: add method to encrypt all user files using old system
+	## TODO: add method to decrypt all user files using old system
+	
+	
+	# Admin UI:
+	
+	## DONE: changing user password also changes encryption passphrase
+	
+	## TODO: add support for optional recovery in case of lost passphrase / keys
+	## TODO: add admin optional required long passphrase for users
+	## TODO: add UI buttons for encrypt / decrypt everything
+	## TODO: implement flag system to allow user to specify encryption by folder, subfolder, etc.
+	
+	
+	# Sharing:
+	
+	## TODO: add support for encrypting to multiple public keys
+	## TODO: add support for decrypting to multiple private keys
+	
+	
+	# Integration testing:
+	
+	## TODO: test new encryption with webdav
+	## TODO: test new encryption with versioning
+	## TODO: test new encryption with sharing
+	## TODO: test new encryption with proxies
+	
+	
+	private $view; // OC_FilesystemView object for filesystem operations
+	private $pwd; // User Password
+	private $client; // Client side encryption mode flag
+	private $publicKeyDir; // Directory containing all public user keys
+	private $encryptionDir; // Directory containing user's files_encryption
+	private $keyfilesPath; // Directory containing user's keyfiles
+	private $publicKeyPath; // Path to user's public key
+	private $privateKeyPath; // Path to user's private key
+
+	public function __construct( \OC_FilesystemView $view, $userId, $client = false ) {
+	
+		$this->view = $view;
+		$this->userId = $userId;
+		$this->client = $client;
+		$this->publicKeyDir =  '/' . 'public-keys';
+		$this->encryptionDir =  '/' . $this->userId . '/' . 'files_encryption';
+		$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+		$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+		$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+		
+	}
+	
+	public function ready() {
+		
+		if( 
+		!$this->view->file_exists( $this->keyfilesPath )
+		or !$this->view->file_exists( $this->publicKeyPath )
+		or !$this->view->file_exists( $this->privateKeyPath ) 
+		) {
+		
+			return false;
+			
+		} else {
+		
+			return true;
+			
+		}
+	
+	}
+	
+        /**
+         * @brief Sets up user folders and keys for serverside encryption
+         * @param $passphrase passphrase to encrypt server-stored private key with
+         */
+	public function setupServerSide( $passphrase = null ) {
+		
+		// Create shared public key directory
+		if( !$this->view->file_exists( $this->publicKeyDir ) ) {
+		
+			$this->view->mkdir( $this->publicKeyDir );
+		
+		}
+		
+		// Create encryption app directory
+		if( !$this->view->file_exists( $this->encryptionDir ) ) {
+		
+			$this->view->mkdir( $this->encryptionDir );
+		
+		}
+		
+		// Create mirrored keyfile directory
+		if( !$this->view->file_exists( $this->keyfilesPath ) ) {
+		
+			$this->view->mkdir( $this->keyfilesPath );
+		
+		}
+		
+		// Create user keypair
+		if ( 
+		!$this->view->file_exists( $this->publicKeyPath ) 
+		or !$this->view->file_exists( $this->privateKeyPath ) 
+		) {
+		
+			// Generate keypair
+			$keypair = Crypt::createKeypair();
+		
+			\OC_FileProxy::$enabled = false;
+			
+			// Save public key
+			$this->view->file_put_contents( $this->publicKeyPath, $keypair['publicKey'] );
+			
+			// Encrypt private key with user pwd as passphrase
+			$encryptedPrivateKey = Crypt::symmetricEncryptFileContent( $keypair['privateKey'], $passphrase );
+			
+			// Save private key
+			$this->view->file_put_contents( $this->privateKeyPath, $encryptedPrivateKey );
+			
+			\OC_FileProxy::$enabled = true;
+			
+		}
+		
+		return true;
+	
+	}
+	
+	public function findFiles( $directory, $type = 'plain' ) {
+	
+	# TODO: test finding non plain content
+		
+		if ( $handle = $this->view->opendir( $directory ) ) {
+
+			while ( false !== ( $file = readdir( $handle ) ) ) {
+			
+				if (
+				$file != "." 
+				&& $file != ".."
+				) {
+				
+					$filePath = $directory . '/' . $this->view->getRelativePath( '/' . $file );
+					
+					var_dump($filePath);
+					
+					if ( $this->view->is_dir( $filePath ) ) { 
+						
+						$this->findFiles( $filePath );
+						
+					} elseif ( $this->view->is_file( $filePath ) ) {
+					
+						if ( $type == 'plain' ) {
+					
+							$this->files[] = array( 'name' => $file, 'path' => $filePath );
+							
+						} elseif ( $type == 'encrypted' ) {
+						
+							if (  Crypt::isEncryptedContent( $this->view->file_get_contents( $filePath ) ) ) {
+							
+								$this->files[] = array( 'name' => $file, 'path' => $filePath );
+							
+							}
+						
+						} elseif ( $type == 'legacy' ) {
+						
+							if (  Crypt::isLegacyEncryptedContent( $this->view->file_get_contents( $filePath ) ) ) {
+							
+								$this->files[] = array( 'name' => $file, 'path' => $filePath );
+							
+							}
+						
+						}
+					
+					}
+					
+				}
+				
+			}
+			
+			if ( !empty( $this->files ) ) {
+			
+				return $this->files;
+			
+			} else {
+			
+				return false;
+			
+			}
+		
+		}
+		
+		return false;
+
+	}
+	
+        /**
+         * @brief Check if a given path identifies an encrypted file
+         * @return true / false
+         */
+	public function isEncryptedPath( $path ) {
+	
+		// Disable encryption proxy so data retreived is in its 
+		// original form
+		\OC_FileProxy::$enabled = false;
+	
+		$data = $this->view->file_get_contents( $path );
+		
+		\OC_FileProxy::$enabled = true;
+		
+		return Crypt::isEncryptedContent( $data );
+	
+	}
+	
+	public function encryptAll( $directory ) {
+	
+		$plainFiles = $this->findFiles( $this->view, 'plain' );
+		
+		if ( $this->encryptFiles( $plainFiles ) ) {
+		
+			return true;
+			
+		} else {
+		
+			return false;
+			
+		}
+		
+	}
+	
+	public function getPath( $pathName ) {
+	
+		switch ( $pathName ) {
+			
+			case 'publicKeyDir':
+			
+				return $this->publicKeyDir;
+				
+				break;
+				
+			case 'encryptionDir':
+			
+				return $this->encryptionDir;
+				
+				break;
+				
+			case 'keyfilesPath':
+			
+				return $this->keyfilesPath;
+				
+				break;
+				
+			case 'publicKeyPath':
+			
+				return $this->publicKeyPath;
+				
+				break;
+				
+			case 'privateKeyPath':
+			
+				return $this->privateKeyPath;
+				
+				break;
+			
+		}
+		
+	}
+
+}
diff --git a/apps/files_encryption/settings-personal.php b/apps/files_encryption/settings-personal.php
new file mode 100644
index 0000000000000000000000000000000000000000..014288f2efe7d4dff3f79bf0a9a4775dd4e3ad63
--- /dev/null
+++ b/apps/files_encryption/settings-personal.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright (c) 2012 Bjoern Schiessle <schiessle@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+$sysEncMode = \OC_Appconfig::getValue('files_encryption', 'mode', 'none');
+
+if ($sysEncMode == 'user') {
+
+	$tmpl = new OCP\Template( 'files_encryption', 'settings-personal');
+
+	$query = \OC_DB::prepare( "SELECT mode FROM *PREFIX*encryption WHERE uid = ?" );
+	$result = $query->execute(array(\OCP\User::getUser()));
+	
+	if ($row = $result->fetchRow()){
+		$mode = $row['mode'];
+	} else {
+		$mode = 'none';
+	}
+	
+	OCP\Util::addscript('files_encryption','settings-personal');
+	$tmpl->assign('encryption_mode', $mode);
+	return $tmpl->fetchPage();
+}
+
+return null;
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index 94ff5ab94bab3561774780c16d777891915d79c4..d1260f44e9f6ef98a6702f13a9fc3fd3a2a38073 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -6,17 +6,16 @@
  * See the COPYING-README file.
  */
 
-OC_Util::checkAdminUser();
+\OC_Util::checkAdminUser();
 
-$tmpl = new OCP\Template( 'files_encryption', 'settings');
-$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
-												'type_blacklist',
-												'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
-$enabled=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
-$tmpl->assign('blacklist', $blackList);
-$tmpl->assign('encryption_enabled', $enabled);
+$tmpl = new OCP\Template( 'files_encryption', 'settings' );
 
-OCP\Util::addscript('files_encryption', 'settings');
-OCP\Util::addscript('core', 'multiselect');
+$blackList = explode( ',', \OCP\Config::getAppValue( 'files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg' ) );
+
+$tmpl->assign( 'blacklist', $blackList );
+$tmpl->assign( 'encryption_mode', \OC_Appconfig::getValue( 'files_encryption', 'mode', 'none' ) );
+
+\OCP\Util::addscript( 'files_encryption', 'settings' );
+\OCP\Util::addscript( 'core', 'multiselect' );
 
 return $tmpl->fetchPage();
diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
new file mode 100644
index 0000000000000000000000000000000000000000..1274bd3bb5c34b26a35cacde2acaf4f4460acd2c
--- /dev/null
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -0,0 +1,45 @@
+<form id="encryption">
+	<fieldset class="personalblock">
+		<strong><?php echo $l->t('Choose encryption mode:'); ?></strong>
+		<p>
+			<input 
+			type="hidden" 
+			name="prev_encryption_mode" 
+			id="prev_encryption_mode" 
+			value="<?php echo $_['encryption_mode']; ?>"
+			>
+			
+			<input 
+			type="radio" 
+			name="encryption_mode" 
+			value="client" 
+			id='client_encryption' 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"?>
+			/> 
+			<?php echo $l->t('Client side encryption (most secure but makes it impossible to access your data from the web interface)'); ?>
+			<br />
+			
+			<input 
+			type="radio" 
+			name="encryption_mode" 
+			value="server" 
+			id='server_encryption' 
+			style="width:20px;" <?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"?>
+			/> 
+			<?php echo $l->t('Server side encryption (allows you to access your files from the web interface and the desktop client)'); ?>
+			<br />
+			
+			<input 
+			type="radio" 
+			name="encryption_mode" 
+			value="none" 
+			id='none_encryption' 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"?>
+			/> 
+			<?php echo $l->t('None (no encryption at all)'); ?>
+			<br/>
+		</p>
+	</fieldset>
+</form>
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 268b1a80ccd10e26df27eeceda2e961a7eb4e6c5..544ec793f375890e1781342b4bfac9d6d3e0263b 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -1,14 +1,79 @@
-<form id="calendar">
+<form id="encryption">
 	<fieldset class="personalblock">
-		<legend><strong><?php echo $l->t('Encryption');?></strong></legend>
-		<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
-			   id='enable_encryption' ></input>
-		<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label><br />
-		<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
-			<?php foreach ($_['blacklist'] as $type): ?>
-				<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
+		
+		<strong>
+			<?php echo $l->t('Choose encryption mode:'); ?>
+		</strong>
+		
+		<p>
+			<i>
+				<?php echo $l->t('Important: Once you selected an encryption mode there is no way to change it back'); ?>
+			</i>
+		</p>
+		
+		<p>
+			<input 
+			type="radio" 
+			name="encryption_mode" 
+			id="client_encryption" 
+			value="client" 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
+			/> 
+			
+			<?php echo $l->t("Client side encryption (most secure but makes it impossible to access your data from the web interface)"); ?>
+			<br />
+			
+			<input
+			type="radio" 
+			name="encryption_mode" 
+			id="server_encryption" 
+			value="server" 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
+			/> 
+			
+			<?php echo $l->t('Server side encryption (allows you to access your files from the web interface and the desktop client)'); ?>
+			<br />
+			
+			<input
+			type="radio" 
+			name="encryption_mode" 
+			id="user_encryption" 
+			value="user" 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'user') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
+			/>
+			
+			<?php echo $l->t('User specific (let the user decide)'); ?>
+			<br/>
+			
+			<input
+			type="radio" 
+			name="encryption_mode" 
+			id="none_encryption" 
+			value="none" 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>
+			/> 
+			
+			<?php echo $l->t('None (no encryption at all)'); ?>
+			<br/>
+			
+		</p>
+		<p>
+			<strong><?php echo $l->t('Encryption'); ?></strong>
+			
+			<?php echo $l->t("Exclude the following file types from encryption"); ?>
+			
+			<select 
+			id='encryption_blacklist' 
+			title="<?php echo $l->t('None')?>" 
+			multiple="multiple">
+			<?php foreach($_["blacklist"] as $type): ?>
+				<option selected="selected" value="<?php echo $type;?>"> <?php echo $type;?> </option>
 			<?php endforeach;?>
-		</select><br />
-		<?php echo $l->t('Exclude the following file types from encryption'); ?>
+			</select>
+		</p>
 	</fieldset>
 </form>
diff --git a/apps/files_encryption/tests/binary b/apps/files_encryption/test/binary
similarity index 100%
rename from apps/files_encryption/tests/binary
rename to apps/files_encryption/test/binary
diff --git a/apps/files_encryption/test/crypt.php b/apps/files_encryption/test/crypt.php
new file mode 100755
index 0000000000000000000000000000000000000000..19c10ab0ab5b358a363358004d223e2e7a965d58
--- /dev/null
+++ b/apps/files_encryption/test/crypt.php
@@ -0,0 +1,667 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, and
+ * Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+//require_once "PHPUnit/Framework/TestCase.php";
+require_once realpath( dirname(__FILE__).'/../../../3rdparty/Crypt_Blowfish/Blowfish.php' );
+require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
+require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
+require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
+require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
+require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+
+use OCA\Encryption;
+
+// This has to go here because otherwise session errors arise, and the private 
+// encryption key needs to be saved in the session
+\OC_User::login( 'admin', 'admin' );
+
+/**
+ * @note It would be better to use Mockery here for mocking out the session 
+ * handling process, and isolate calls to session class and data from the unit 
+ * tests relating to them (stream etc.). However getting mockery to work and 
+ * overload classes whilst also using the OC autoloader is difficult due to 
+ * load order Pear errors.
+ */
+
+class Test_Crypt extends \PHPUnit_Framework_TestCase {
+	
+	function setUp() {
+		
+		// set content for encrypting / decrypting in tests
+		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+		$this->dataShort = 'hats';
+		$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+		$this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
+		$this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+		$this->randomKey = Encryption\Crypt::generateKey();
+		
+		$keypair = Encryption\Crypt::createKeypair();
+		$this->genPublicKey =  $keypair['publicKey'];
+		$this->genPrivateKey = $keypair['privateKey'];
+		
+		$this->view = new \OC_FilesystemView( '/' );
+		
+		\OC_User::setUserId( 'admin' );
+		$this->userId = 'admin';
+		$this->pass = 'admin';
+		
+		\OC_Filesystem::init( '/' );
+		\OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
+		
+	}
+	
+	function tearDown() {
+	
+	}
+
+	function testGenerateKey() {
+	
+		# TODO: use more accurate (larger) string length for test confirmation
+		
+		$key = Encryption\Crypt::generateKey();
+		
+		$this->assertTrue( strlen( $key ) > 16 );
+	
+	}
+	
+	function testGenerateIv() {
+		
+		$iv = Encryption\Crypt::generateIv();
+		
+		$this->assertEquals( 16, strlen( $iv ) );
+		
+		return $iv;
+	
+	}
+	
+	/**
+	 * @depends testGenerateIv
+	 */
+	function testConcatIv( $iv ) {
+		
+		$catFile = Encryption\Crypt::concatIv( $this->dataLong, $iv );
+		
+		// Fetch encryption metadata from end of file
+		$meta = substr( $catFile, -22 );
+		
+		$identifier = substr( $meta, 0, 6);
+		
+		// Fetch IV from end of file
+		$foundIv = substr( $meta, 6 );
+		
+		$this->assertEquals( '00iv00', $identifier );
+		
+		$this->assertEquals( $iv, $foundIv );
+		
+		// Remove IV and IV identifier text to expose encrypted content
+		$data = substr( $catFile, 0, -22 );
+		
+		$this->assertEquals( $this->dataLong, $data );
+		
+		return array(
+			'iv' => $iv
+			, 'catfile' => $catFile
+		);
+	
+	}
+	
+	/**
+	 * @depends testConcatIv
+	 */
+	function testSplitIv( $testConcatIv ) {
+		
+		// Split catfile into components
+		$splitCatfile = Encryption\Crypt::splitIv( $testConcatIv['catfile'] );
+		
+		// Check that original IV and split IV match
+		$this->assertEquals( $testConcatIv['iv'], $splitCatfile['iv'] );
+		
+		// Check that original data and split data match
+		$this->assertEquals( $this->dataLong, $splitCatfile['encrypted'] );
+	
+	}
+	
+	function testAddPadding() {
+	
+		$padded = Encryption\Crypt::addPadding( $this->dataLong );
+		
+		$padding = substr( $padded, -2 );
+		
+		$this->assertEquals( 'xx' , $padding );
+		
+		return $padded;
+	
+	}
+	
+	/**
+	 * @depends testAddPadding
+	 */
+	function testRemovePadding( $padded ) {
+	
+		$noPadding = Encryption\Crypt::RemovePadding( $padded );
+		
+		$this->assertEquals( $this->dataLong, $noPadding );
+	
+	}
+	
+	function testEncrypt() {
+	
+		$random = openssl_random_pseudo_bytes( 13 );
+
+		$iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
+
+		$crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
+
+		$this->assertNotEquals( $this->dataUrl, $crypted );
+	
+	}
+	
+	function testDecrypt() {
+	
+		$random = openssl_random_pseudo_bytes( 13 );
+
+		$iv = substr( base64_encode( $random ), 0, -4 ); // i.e. E5IG033j+mRNKrht
+
+		$crypted = Encryption\Crypt::encrypt( $this->dataUrl, $iv, 'hat' );
+	
+		$decrypt = Encryption\Crypt::decrypt( $crypted, $iv, 'hat' );
+
+		$this->assertEquals( $this->dataUrl, $decrypt );
+	
+	}
+	
+	function testSymmetricEncryptFileContent() {
+	
+		# TODO: search in keyfile for actual content as IV will ensure this test always passes
+		
+		$crypted = Encryption\Crypt::symmetricEncryptFileContent( $this->dataShort, 'hat' );
+
+		$this->assertNotEquals( $this->dataShort, $crypted );
+		
+
+		$decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted, 'hat' );
+
+		$this->assertEquals( $this->dataShort, $decrypt );
+		
+	}
+	
+	// These aren't used for now
+// 	function testSymmetricBlockEncryptShortFileContent() {
+// 		
+// 		$crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataShort, $this->randomKey );
+// 		
+// 		$this->assertNotEquals( $this->dataShort, $crypted );
+// 		
+// 
+// 		$decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
+// 
+// 		$this->assertEquals( $this->dataShort, $decrypt );
+// 		
+// 	}
+// 	
+// 	function testSymmetricBlockEncryptLongFileContent() {
+// 		
+// 		$crypted = Encryption\Crypt::symmetricBlockEncryptFileContent( $this->dataLong, $this->randomKey );
+// 		
+// 		$this->assertNotEquals( $this->dataLong, $crypted );
+// 		
+// 
+// 		$decrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $crypted, $this->randomKey );
+// 
+// 		$this->assertEquals( $this->dataLong, $decrypt );
+// 		
+// 	}
+	
+	function testSymmetricStreamEncryptShortFileContent() { 
+		
+		$filename = 'tmp-'.time();
+		
+		$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
+		
+		// Test that data was successfully written
+		$this->assertTrue( is_int( $cryptedFile ) );
+		
+		
+		// Get file contents without using any wrapper to get it's actual contents on disk
+		$retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
+		
+		// Check that the file was encrypted before being written to disk
+		$this->assertNotEquals( $this->dataShort, $retreivedCryptedFile );
+		
+		// Get private key
+		$encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+		
+		$decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
+		
+		
+		// Get keyfile
+		$encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
+		
+		$decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
+		
+		
+		// Manually decrypt
+		$manualDecrypt = Encryption\Crypt::symmetricBlockDecryptFileContent( $retreivedCryptedFile, $decryptedKeyfile );
+		
+		// Check that decrypted data matches
+		$this->assertEquals( $this->dataShort, $manualDecrypt );
+		
+	}
+	
+	/**
+	 * @brief Test that data that is written by the crypto stream wrapper
+	 * @note Encrypted data is manually prepared and decrypted here to avoid dependency on success of stream_read
+	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual 
+	 * reassembly of its data
+	 */
+	function testSymmetricStreamEncryptLongFileContent() {
+		
+		// Generate a a random filename
+		$filename = 'tmp-'.time();
+		
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong.$this->dataLong );
+		
+		// Test that data was successfully written
+		$this->assertTrue( is_int( $cryptedFile ) );
+		
+		// Get file contents without using any wrapper to get it's actual contents on disk
+		$retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
+		
+// 		echo "\n\n\$retreivedCryptedFile = $retreivedCryptedFile\n\n";
+		
+		// Check that the file was encrypted before being written to disk
+		$this->assertNotEquals( $this->dataLong.$this->dataLong, $retreivedCryptedFile );
+		
+		// Manuallly split saved file into separate IVs and encrypted chunks
+		$r = preg_split('/(00iv00.{16,18})/', $retreivedCryptedFile, NULL, PREG_SPLIT_DELIM_CAPTURE);
+		
+		//print_r($r);
+		
+		// Join IVs and their respective data chunks
+		$e = array( $r[0].$r[1], $r[2].$r[3], $r[4].$r[5], $r[6].$r[7], $r[8].$r[9], $r[10].$r[11], $r[12].$r[13] );//.$r[11], $r[12].$r[13], $r[14] );
+		
+		//print_r($e);
+		
+		
+		// Get private key
+		$encryptedPrivateKey = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+		
+		$decryptedPrivateKey = Encryption\Crypt::symmetricDecryptFileContent( $encryptedPrivateKey, $this->pass );
+		
+		
+		// Get keyfile
+		$encryptedKeyfile = Encryption\Keymanager::getFileKey( $this->view, $this->userId, $filename );
+		
+		$decryptedKeyfile = Encryption\Crypt::keyDecrypt( $encryptedKeyfile, $decryptedPrivateKey );
+		
+		
+		// Set var for reassembling decrypted content
+		$decrypt = '';
+		
+		// Manually decrypt chunk
+		foreach ($e as $e) {
+		
+// 			echo "\n\$e = $e";
+			
+			$chunkDecrypt = Encryption\Crypt::symmetricDecryptFileContent( $e, $decryptedKeyfile );
+			
+			// Assemble decrypted chunks
+			$decrypt .= $chunkDecrypt;
+			
+// 			echo "\n\$chunkDecrypt = $chunkDecrypt";
+			
+		}
+		
+// 		echo "\n\$decrypt = $decrypt";
+		
+		$this->assertEquals( $this->dataLong.$this->dataLong, $decrypt );
+		
+		// Teardown
+		
+		$this->view->unlink( $filename );
+		
+		Encryption\Keymanager::deleteFileKey( $filename );
+		
+	}
+	
+	/**
+	 * @brief Test that data that is read by the crypto stream wrapper
+	 */
+	function testSymmetricStreamDecryptShortFileContent() {
+		
+		$filename = 'tmp-'.time();
+		
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataShort );
+		
+		// Test that data was successfully written
+		$this->assertTrue( is_int( $cryptedFile ) );
+		
+		
+		// Get file contents without using any wrapper to get it's actual contents on disk
+		$retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
+		
+		$decrypt = file_get_contents( 'crypt://' . $filename );
+		
+		$this->assertEquals( $this->dataShort, $decrypt );
+		
+	}
+	
+	function testSymmetricStreamDecryptLongFileContent() {
+		
+		$filename = 'tmp-'.time();
+		
+		// Save long data as encrypted file using stream wrapper
+		$cryptedFile = file_put_contents( 'crypt://' . $filename, $this->dataLong );
+		
+		// Test that data was successfully written
+		$this->assertTrue( is_int( $cryptedFile ) );
+		
+		
+		// Get file contents without using any wrapper to get it's actual contents on disk
+		$retreivedCryptedFile = $this->view->file_get_contents( $this->userId . '/files/' . $filename );
+		
+		$decrypt = file_get_contents( 'crypt://' . $filename );
+		
+		$this->assertEquals( $this->dataLong, $decrypt );
+		
+	}
+	
+	// Is this test still necessary?
+// 	function testSymmetricBlockStreamDecryptFileContent() {
+// 	
+// 		\OC_User::setUserId( 'admin' );
+// 		
+// 		// Disable encryption proxy to prevent unwanted en/decryption
+// 		\OC_FileProxy::$enabled = false;
+// 		
+// 		$cryptedFile = file_put_contents( 'crypt://' . '/blockEncrypt', $this->dataUrl );
+// 		
+// 		// Disable encryption proxy to prevent unwanted en/decryption
+// 		\OC_FileProxy::$enabled = false;
+// 		
+// 		echo "\n\n\$cryptedFile = " . $this->view->file_get_contents( '/blockEncrypt' );
+// 		
+// 		$retreivedCryptedFile = file_get_contents( 'crypt://' . '/blockEncrypt' );
+// 		
+// 		$this->assertEquals( $this->dataUrl, $retreivedCryptedFile );
+// 		
+// 		\OC_FileProxy::$enabled = false;
+// 		
+// 	}
+
+	function testSymmetricEncryptFileContentKeyfile() {
+	
+		# TODO: search in keyfile for actual content as IV will ensure this test always passes
+	
+		$crypted = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
+		
+		$this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
+		
+		
+		$decrypt = Encryption\Crypt::symmetricDecryptFileContent( $crypted['encrypted'], $crypted['key'] );
+		
+		$this->assertEquals( $this->dataUrl, $decrypt );
+	
+	}
+	
+	function testIsEncryptedContent() {
+		
+		$this->assertFalse( Encryption\Crypt::isEncryptedContent( $this->dataUrl ) );
+		
+		$this->assertFalse( Encryption\Crypt::isEncryptedContent( $this->legacyEncryptedData ) );
+		
+		$keyfileContent = Encryption\Crypt::symmetricEncryptFileContent( $this->dataUrl, 'hat' );
+
+		$this->assertTrue( Encryption\Crypt::isEncryptedContent( $keyfileContent ) );
+		
+	}
+	
+	function testMultiKeyEncrypt() {
+		
+		# TODO: search in keyfile for actual content as IV will ensure this test always passes
+		
+		$pair1 = Encryption\Crypt::createKeypair();
+		
+		$this->assertEquals( 2, count( $pair1 ) );
+		
+		$this->assertTrue( strlen( $pair1['publicKey'] ) > 1 );
+		
+		$this->assertTrue( strlen( $pair1['privateKey'] ) > 1 );
+		
+
+		$crypted = Encryption\Crypt::multiKeyEncrypt( $this->dataUrl, array( $pair1['publicKey'] ) );
+		
+		$this->assertNotEquals( $this->dataUrl, $crypted['encrypted'] );
+		
+
+		$decrypt = Encryption\Crypt::multiKeyDecrypt( $crypted['encrypted'], $crypted['keys'][0], $pair1['privateKey'] );
+		
+ 		$this->assertEquals( $this->dataUrl, $decrypt );
+	
+	}
+	
+	function testKeyEncrypt() {
+		
+		// Generate keypair
+		$pair1 = Encryption\Crypt::createKeypair();
+		
+		// Encrypt data
+		$crypted = Encryption\Crypt::keyEncrypt( $this->dataUrl, $pair1['publicKey'] );
+		
+		$this->assertNotEquals( $this->dataUrl, $crypted );
+		
+		// Decrypt data
+		$decrypt = Encryption\Crypt::keyDecrypt( $crypted, $pair1['privateKey'] );
+		
+		$this->assertEquals( $this->dataUrl, $decrypt );
+	
+	}
+	
+	// What is the point of this test? It doesn't use keyEncryptKeyfile()
+	function testKeyEncryptKeyfile() {
+	
+		# TODO: Don't repeat encryption from previous tests, use PHPUnit test interdependency instead
+		
+		// Generate keypair
+		$pair1 = Encryption\Crypt::createKeypair();
+		
+		// Encrypt plain data, generate keyfile & encrypted file
+		$cryptedData = Encryption\Crypt::symmetricEncryptFileContentKeyfile( $this->dataUrl );
+		
+		// Encrypt keyfile
+		$cryptedKey = Encryption\Crypt::keyEncrypt( $cryptedData['key'], $pair1['publicKey'] );
+		
+		// Decrypt keyfile
+		$decryptKey = Encryption\Crypt::keyDecrypt( $cryptedKey, $pair1['privateKey'] );
+		
+		// Decrypt encrypted file
+		$decryptData = Encryption\Crypt::symmetricDecryptFileContent( $cryptedData['encrypted'], $decryptKey );
+		
+		$this->assertEquals( $this->dataUrl, $decryptData );
+	
+	}
+	
+	/**
+	 * @brief test functionality of keyEncryptKeyfile() and 
+	 * keyDecryptKeyfile()
+	 */
+	function testKeyDecryptKeyfile() {
+		
+		$encrypted = Encryption\Crypt::keyEncryptKeyfile( $this->dataShort, $this->genPublicKey );
+		
+		$this->assertNotEquals( $encrypted['data'], $this->dataShort );
+		
+		$decrypted = Encryption\Crypt::keyDecryptKeyfile( $encrypted['data'], $encrypted['key'], $this->genPrivateKey );
+		
+		$this->assertEquals( $decrypted, $this->dataShort );
+		
+	}
+
+	
+	/**
+	 * @brief test encryption using legacy blowfish method
+	 */
+	function testLegacyEncryptShort() {
+	
+		$crypted = Encryption\Crypt::legacyEncrypt( $this->dataShort, $this->pass );
+
+		$this->assertNotEquals( $this->dataShort, $crypted );
+		
+		# TODO: search inencrypted text for actual content to ensure it
+		# genuine transformation
+		
+		return $crypted;
+		
+	}
+	
+	/**
+	 * @brief test decryption using legacy blowfish method
+	 * @depends testLegacyEncryptShort
+	 */
+	function testLegacyDecryptShort( $crypted ) {
+	
+		$decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
+		
+		$this->assertEquals( $this->dataShort, $decrypted );
+		
+	}
+
+	/**
+	 * @brief test encryption using legacy blowfish method
+	 */
+	function testLegacyEncryptLong() {
+	
+		$crypted = Encryption\Crypt::legacyEncrypt( $this->dataLong, $this->pass );
+
+		$this->assertNotEquals( $this->dataLong, $crypted );
+		
+		# TODO: search inencrypted text for actual content to ensure it
+		# genuine transformation
+		
+		return $crypted;
+		
+	}
+	
+	/**
+	 * @brief test decryption using legacy blowfish method
+	 * @depends testLegacyEncryptLong
+	 */
+	function testLegacyDecryptLong( $crypted ) {
+	
+		$decrypted = Encryption\Crypt::legacyDecrypt( $crypted, $this->pass );
+		
+		$this->assertEquals( $this->dataLong, $decrypted );
+		
+	}
+	
+	/**
+	 * @brief test generation of legacy encryption key
+	 * @depends testLegacyDecryptShort
+	 */
+	function testLegacyCreateKey() {
+	
+		// Create encrypted key
+		$encKey = Encryption\Crypt::legacyCreateKey( $this->pass );
+		
+		// Decrypt key
+		$key = Encryption\Crypt::legacyDecrypt( $encKey, $this->pass );
+		
+		$this->assertTrue( is_numeric( $key ) );
+		
+		// Check that key is correct length
+		$this->assertEquals( 20, strlen( $key ) );
+		
+	}
+
+	/**
+	 * @brief test decryption using legacy blowfish method
+	 * @depends testLegacyEncryptLong
+	 */
+	function testLegacyKeyRecryptKeyfileEncrypt( $crypted ) {
+	
+		$recrypted = Encryption\Crypt::LegacyKeyRecryptKeyfile( $crypted, $this->pass, $this->genPublicKey, $this->pass );
+		
+		$this->assertNotEquals( $this->dataLong, $recrypted['data'] );
+		
+		return $recrypted;
+		
+		# TODO: search inencrypted text for actual content to ensure it
+		# genuine transformation
+		
+	}
+
+// 	function testEncryption(){
+// 	
+// 		$key=uniqid();
+// 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// 		$source=file_get_contents($file); //nice large text file
+// 		$encrypted=OC_Encryption\Crypt::encrypt($source,$key);
+// 		$decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
+// 		$decrypted=rtrim($decrypted, "\0");
+// 		$this->assertNotEquals($encrypted,$source);
+// 		$this->assertEquals($decrypted,$source);
+// 
+// 		$chunk=substr($source,0,8192);
+// 		$encrypted=OC_Encryption\Crypt::encrypt($chunk,$key);
+// 		$this->assertEquals(strlen($chunk),strlen($encrypted));
+// 		$decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
+// 		$decrypted=rtrim($decrypted, "\0");
+// 		$this->assertEquals($decrypted,$chunk);
+// 		
+// 		$encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
+// 		$decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
+// 		$this->assertNotEquals($encrypted,$source);
+// 		$this->assertEquals($decrypted,$source);
+// 
+// 		$tmpFileEncrypted=OCP\Files::tmpFile();
+// 		OC_Encryption\Crypt::encryptfile($file,$tmpFileEncrypted,$key);
+// 		$encrypted=file_get_contents($tmpFileEncrypted);
+// 		$decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
+// 		$this->assertNotEquals($encrypted,$source);
+// 		$this->assertEquals($decrypted,$source);
+// 
+// 		$tmpFileDecrypted=OCP\Files::tmpFile();
+// 		OC_Encryption\Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
+// 		$decrypted=file_get_contents($tmpFileDecrypted);
+// 		$this->assertEquals($decrypted,$source);
+// 
+// 		$file=OC::$SERVERROOT.'/core/img/weather-clear.png';
+// 		$source=file_get_contents($file); //binary file
+// 		$encrypted=OC_Encryption\Crypt::encrypt($source,$key);
+// 		$decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
+// 		$decrypted=rtrim($decrypted, "\0");
+// 		$this->assertEquals($decrypted,$source);
+// 
+// 		$encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
+// 		$decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key);
+// 		$this->assertEquals($decrypted,$source);
+// 
+// 	}
+// 
+// 	function testBinary(){
+// 		$key=uniqid();
+// 	
+// 		$file=__DIR__.'/binary';
+// 		$source=file_get_contents($file); //binary file
+// 		$encrypted=OC_Encryption\Crypt::encrypt($source,$key);
+// 		$decrypted=OC_Encryption\Crypt::decrypt($encrypted,$key);
+// 
+// 		$decrypted=rtrim($decrypted, "\0");
+// 		$this->assertEquals($decrypted,$source);
+// 
+// 		$encrypted=OC_Encryption\Crypt::blockEncrypt($source,$key);
+// 		$decrypted=OC_Encryption\Crypt::blockDecrypt($encrypted,$key,strlen($source));
+// 		$this->assertEquals($decrypted,$source);
+// 	}
+	
+}
diff --git a/apps/files_encryption/test/keymanager.php b/apps/files_encryption/test/keymanager.php
new file mode 100644
index 0000000000000000000000000000000000000000..f02d6eb5f7a873428bae80b3b011b10d24072ed9
--- /dev/null
+++ b/apps/files_encryption/test/keymanager.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+ 
+//require_once "PHPUnit/Framework/TestCase.php";
+require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
+require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
+require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
+require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
+require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+
+use OCA\Encryption;
+
+// This has to go here because otherwise session errors arise, and the private 
+// encryption key needs to be saved in the session
+\OC_User::login( 'admin', 'admin' );
+
+class Test_Keymanager extends \PHPUnit_Framework_TestCase {
+	
+	function setUp() {
+		
+		\OC_FileProxy::$enabled = false;
+		
+		// set content for encrypting / decrypting in tests
+		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+		$this->dataShort = 'hats';
+		$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+		$this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
+		$this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+		$this->randomKey = Encryption\Crypt::generateKey();
+		
+		$keypair = Encryption\Crypt::createKeypair();
+		$this->genPublicKey =  $keypair['publicKey'];
+		$this->genPrivateKey = $keypair['privateKey'];
+		
+		$this->view = new \OC_FilesystemView( '/' );
+		
+		\OC_User::setUserId( 'admin' );
+		$this->userId = 'admin';
+		$this->pass = 'admin';
+		
+		\OC_Filesystem::init( '/' );
+		\OC_Filesystem::mount( 'OC_Filestorage_Local', array('datadir' => \OC_User::getHome($this->userId)), '/' );
+	
+	}
+	
+	function tearDown(){
+	
+		\OC_FileProxy::$enabled = true;
+		
+	}
+
+	function testGetPrivateKey() {
+	
+		$key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+		 
+		// Will this length vary? Perhaps we should use a range instead
+		$this->assertEquals( 2296, strlen( $key ) );
+	
+	}
+	
+	function testGetPublicKey() {
+
+		$key = Encryption\Keymanager::getPublicKey( $this->view, $this->userId );
+		
+		$this->assertEquals( 451, strlen( $key ) );
+		
+		$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $key, 0, 26 ) );
+	}
+	
+	function testSetFileKey() {
+	
+		# NOTE: This cannot be tested until we are able to break out 
+		# of the FileSystemView data directory root
+	
+// 		$key = Crypt::symmetricEncryptFileContentKeyfile( $this->data, 'hat' );
+// 		
+// 		$tmpPath = sys_get_temp_dir(). '/' . 'testSetFileKey';
+// 		
+// 		$view = new \OC_FilesystemView( '/tmp/' );
+// 		
+// 		//$view = new \OC_FilesystemView( '/' . $this->userId . '/files_encryption/keyfiles' );
+// 		
+// 		Encryption\Keymanager::setFileKey( $tmpPath, $key['key'], $view );
+	
+	}
+	
+// 	/**
+// 	 * @depends testGetPrivateKey
+// 	 */
+// 	function testGetPrivateKey_decrypt() {
+// 	
+// 		$key = Encryption\Keymanager::getPrivateKey( $this->view, $this->userId );
+// 		
+// 		# TODO: replace call to Crypt with a mock object?
+// 		$decrypted = Encryption\Crypt::symmetricDecryptFileContent( $key, $this->passphrase );
+// 		
+// 		$this->assertEquals( 1704, strlen( $decrypted ) );
+// 		
+// 		$this->assertEquals( '-----BEGIN PRIVATE KEY-----', substr( $decrypted, 0, 27 ) );
+// 	
+// 	}
+	
+	function testGetUserKeys() {
+	
+		$keys = Encryption\Keymanager::getUserKeys( $this->view, $this->userId );
+		
+		$this->assertEquals( 451, strlen( $keys['publicKey'] ) );
+		$this->assertEquals( '-----BEGIN PUBLIC KEY-----', substr( $keys['publicKey'], 0, 26 ) );
+		$this->assertEquals( 2296, strlen( $keys['privateKey'] ) );
+	
+	}
+	
+	function testGetPublicKeys() {
+		
+		# TODO: write me
+		
+	}
+	
+	function testGetFileKey() {
+	
+// 		Encryption\Keymanager::getFileKey( $this->view, $this->userId, $this->filePath );
+	
+	}
+	
+}
diff --git a/apps/files_encryption/test/legacy-encrypted-text.txt b/apps/files_encryption/test/legacy-encrypted-text.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cb5bf50550d91842c8a0bd214edf9569daeadc48
Binary files /dev/null and b/apps/files_encryption/test/legacy-encrypted-text.txt differ
diff --git a/apps/files_encryption/test/proxy.php b/apps/files_encryption/test/proxy.php
new file mode 100644
index 0000000000000000000000000000000000000000..709730f7609ca2464a1faa2c410569b50fa80c19
--- /dev/null
+++ b/apps/files_encryption/test/proxy.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>, 
+ * and Robin Appelman <icewind@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// require_once "PHPUnit/Framework/TestCase.php";
+// require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Generator.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/MockInterface.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Mock.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Container.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Configuration.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CompositeExpectation.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/ExpectationDirector.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Expectation.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/Exception.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/CountValidatorAbstract.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/Exception.php' );
+// require_once realpath( dirname(__FILE__).'/../../../3rdparty/mockery/Mockery/CountValidator/Exact.php' );
+// 
+// use \Mockery as m;
+// use OCA\Encryption;
+
+// class Test_Util extends \PHPUnit_Framework_TestCase {
+// 
+// 	public function setUp() {
+// 	
+// 		$this->proxy = new Encryption\Proxy();
+// 		
+// 		$this->tmpFileName = "tmpFile-".time();
+// 		
+// 		$this->privateKey = file_get_contents( realpath( dirname(__FILE__).'/data/admin.public.key' ) );
+// 		$this->publicKey = file_get_contents( realpath( dirname(__FILE__).'/data/admin.private.key' ) );
+// 		$this->encDataShort = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester-enc' ) );
+// 		$this->encDataShortKey = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester.key' ) );
+// 		
+// 		$this->dataShort = file_get_contents( realpath( dirname(__FILE__).'/data/yoga-manchester' ) );
+// 		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+// 		$this->longDataPath = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+// 		
+// 		$this->data1 = file_get_contents( realpath( dirname(__FILE__).'/../../../data/admin/files/enc-test.txt' ) );
+// 		
+// 		\OC_FileProxy::$enabled = false;
+// 		$this->Encdata1 = file_get_contents( realpath( dirname(__FILE__).'/../../../data/admin/files/enc-test.txt' ) );
+// 		\OC_FileProxy::$enabled = true;
+// 		
+// 		$this->userId = 'admin';
+// 		$this->pass = 'admin';
+// 		
+// 		$this->session = new Encryption\Session();
+// 		
+// $this->session->setPrivateKey( 
+// '-----BEGIN PRIVATE KEY-----
+// MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiH3EA4EpFA7Fx
+// s2dyyfL5jwXeYXrTqQJ6DqKgGn8VsbT3eu8R9KzM2XitVwZe8c8L52DvJ06o5vg0
+// GqPYxilFdOFJe/ggac5Tq8UmJiZS4EqYEMwxBIfIyWTxeGV06/0HOwnVAkqHMcBz
+// 64qldtgi5O8kZMEM2/gKBgU0kMLJzM+8oEWhL1+gsUWQhxd8cKLXypS6iWgqFJrz
+// f/X0hJsJR+gyYxNpahtnjzd/LxLAETrOMsl2tue+BAxmjbAM0aG0NEM0div+b59s
+// 2uz/iWbxImp5pOdYVKcVW89D4XBMyGegR40trV2VwiuX1blKCfdjMsJhiaL9pymp
+// ug1wzyQFAgMBAAECggEAK6c+PZkPPXuVCgpEcliiW6NM0r2m5K3AGKgypQ34csu3
+// z/8foCvIIFPrhCtEw5eTDQ1CHWlNOjY8vHJYJ0U6Onpx86nHIRrMBkMm8FJ1G5LJ
+// U8oKYXwqaozWu/cuPwA//OFc6I5krOzh5n8WaRMkbrgbor8AtebRX74By0AXGrXe
+// cswJI7zR96oFn4Dm7Pgvpg5Zhk1vFJ+w6QtH+4DDJ6PBvlZsRkGxYBLGVd/3qhAI
+// sBAyjFlSzuP4eCRhHOhHC/e4gmAH9evFVXB88jFyRZm3K+jQ5W5CwrVRBCV2lph6
+// 2B6P7CBJN+IjGKMhy+75y13UvvKPv9IwH8Fzl2x1gQKBgQD8qQOr7a6KhSj16wQE
+// jim2xqt9gQ2jH5No405NrKs/PFQQZnzD4YseQsiK//NUjOJiUhaT+L5jhIpzINHt
+// RJpt3bGkEZmLyjdjgTpB3GwZdXa28DNK9VdXZ19qIl/ZH0qAjKmJCRahUDASMnVi
+// M4Pkk9yx9ZIKkri4TcuMWqc0DQKBgQDlHKBTITZq/arYPD6Nl3NsoOdqVRqJrGay
+// 0TjXAVbBXe46+z5lnMsqwXb79nx14hdmSEsZULrw/3f+MnQbdjMTYLFP24visZg9
+// MN8vAiALiiiR1a+Crz+DTA1Q8sGOMVCMqMDmD7QBys3ZuWxuapm0txAiIYUtsjJZ
+// XN76T4nZ2QKBgQCHaT3igzwsWTmesxowJtEMeGWomeXpKx8h89EfqA8PkRGsyIDN
+// qq+YxEoe1RZgljEuaLhZDdNcGsjo8woPk9kAUPTH7fbRCMuutK+4ZJ469s1tNkcH
+// QX5SBcEJbOrZvv967ehe3VQXmJZq6kgnHVzuwKBjcC2ZJRGDFY6l5l/+cQKBgCqh
+// +Adf/8NK7paMJ0urqfPFwSodKfICXZ3apswDWMRkmSbqh4La+Uc8dsqN5Dz/VEFZ
+// JHhSeGbN8uMfOlG93eU2MehdPxtw1pZUWMNjjtj23XO9ooob2CKzbSrp8TBnZsi1
+// widNNr66oTFpeo7VUUK6acsgF6sYJJxSVr+XO1yJAoGAEhvitq8shNKcEY0xCipS
+// k1kbgyS7KKB7opVxI5+ChEqyUDijS3Y9FZixrRIWE6i2uGu86UG+v2lbKvSbM4Qm
+// xvbOcX9OVMnlRb7n8woOP10UMY+ZE2x+YEUXQTLtPYq7F66e1OfxltstMxLQA+3d
+// Y1d5piFV8PXK3Fg2F+Cj5qg=
+// -----END PRIVATE KEY-----
+// '
+// , $this->userId 
+// );
+// 		
+// 		\OC_User::setUserId( $this->userId );
+// 		
+// 	}
+// 
+// 	public function testpreFile_get_contents() {
+// 	
+// 		// This won't work for now because mocking of the static keymanager class isn't working :(
+// 	
+// // 		$mock = m::mock( 'alias:OCA\Encryption\Keymanager' );
+// // 		
+// // 		$mock->shouldReceive( 'getFileKey' )->times(2)->andReturn( $this->encDataShort );
+// // 	
+// // 		$encrypted = $this->proxy->postFile_get_contents( 'data/'.$this->tmpFileName, $this->encDataShortKey );
+// // 		
+// // 		$this->assertNotEquals( $this->dataShort, $encrypted );
+// 
+// 		$decrypted = $this->proxy->postFile_get_contents( 'data/admin/files/enc-test.txt', $this->data1 );
+// 		
+// 	}
+// 
+// }
+
+// class Test_CryptProxy extends PHPUnit_Framework_TestCase {
+// 	private $oldConfig;
+// 	private $oldKey;
+// 	
+// 	public function setUp(){
+// 		$user=OC_User::getUser();
+// 
+// 		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
+// 		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
+// 		$this->oldKey=isset($_SESSION['privateKey'])?$_SESSION['privateKey']:null;
+// 	
+// 		
+// 		//set testing key
+// 		$_SESSION['privateKey']=md5(time());
+// 	
+// 		//clear all proxies and hooks so we can do clean testing
+// 		OC_FileProxy::clearProxies();
+// 		OC_Hook::clear('OC_Filesystem');
+// 
+// 		//enable only the encryption hook
+// 		OC_FileProxy::register(new OC_FileProxy_Encryption());
+// 
+// 		//set up temporary storage
+// 		OC_Filesystem::clearMounts();
+// 		OC_Filesystem::mount('OC_Filestorage_Temporary',array(),'/');
+// 
+// 		OC_Filesystem::init('/'.$user.'/files');
+// 
+// 		//set up the users home folder in the temp storage
+// 		$rootView=new OC_FilesystemView('');
+// 		$rootView->mkdir('/'.$user);
+// 		$rootView->mkdir('/'.$user.'/files');
+// 	}
+// 
+// 	public function tearDown(){
+// 		OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
+// 		if(!is_null($this->oldKey)){
+// 			$_SESSION['privateKey']=$this->oldKey;
+// 		}
+// 	}
+// 
+// 	public function testSimple(){
+// 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// 		$original=file_get_contents($file);
+// 
+// 		OC_Filesystem::file_put_contents('/file',$original);
+// 		
+// 		OC_FileProxy::$enabled=false;
+// 		$stored=OC_Filesystem::file_get_contents('/file');
+// 		OC_FileProxy::$enabled=true;
+// 		
+// 		$fromFile=OC_Filesystem::file_get_contents('/file');
+// 		$this->assertNotEquals($original,$stored);
+// 		$this->assertEquals(strlen($original),strlen($fromFile));
+// 		$this->assertEquals($original,$fromFile);
+// 
+// 	}
+// 
+// 	public function testView(){
+// 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// 		$original=file_get_contents($file);
+// 
+// 		$rootView=new OC_FilesystemView('');
+// 		$view=new OC_FilesystemView('/'.OC_User::getUser());
+// 		$userDir='/'.OC_User::getUser().'/files';
+// 
+// 		$rootView->file_put_contents($userDir.'/file',$original);
+// 
+// 		OC_FileProxy::$enabled=false;
+// 		$stored=$rootView->file_get_contents($userDir.'/file');
+// 		OC_FileProxy::$enabled=true;
+// 
+// 		$this->assertNotEquals($original,$stored);
+// 		$fromFile=$rootView->file_get_contents($userDir.'/file');
+// 		$this->assertEquals($original,$fromFile);
+// 
+// 		$fromFile=$view->file_get_contents('files/file');
+// 		$this->assertEquals($original,$fromFile);
+// 	}
+// 
+// 	public function testBinary(){
+// 		$file=__DIR__.'/binary';
+// 		$original=file_get_contents($file);
+// 
+// 		OC_Filesystem::file_put_contents('/file',$original);
+// 
+// 		OC_FileProxy::$enabled=false;
+// 		$stored=OC_Filesystem::file_get_contents('/file');
+// 		OC_FileProxy::$enabled=true;
+// 
+// 		$fromFile=OC_Filesystem::file_get_contents('/file');
+// 		$this->assertNotEquals($original,$stored);
+// 		$this->assertEquals(strlen($original),strlen($fromFile));
+// 		$this->assertEquals($original,$fromFile);
+// 
+// 		$file=__DIR__.'/zeros';
+// 		$original=file_get_contents($file);
+// 
+// 		OC_Filesystem::file_put_contents('/file',$original);
+// 
+// 		OC_FileProxy::$enabled=false;
+// 		$stored=OC_Filesystem::file_get_contents('/file');
+// 		OC_FileProxy::$enabled=true;
+// 
+// 		$fromFile=OC_Filesystem::file_get_contents('/file');
+// 		$this->assertNotEquals($original,$stored);
+// 		$this->assertEquals(strlen($original),strlen($fromFile));
+// 	}
+// }
diff --git a/apps/files_encryption/test/stream.php b/apps/files_encryption/test/stream.php
new file mode 100644
index 0000000000000000000000000000000000000000..ba82ac80eabb17dc16d01dce0d61d0f042c8a1b0
--- /dev/null
+++ b/apps/files_encryption/test/stream.php
@@ -0,0 +1,226 @@
+// <?php
+// /**
+//  * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
+//  * This file is licensed under the Affero General Public License version 3 or
+//  * later.
+//  * See the COPYING-README file.
+//  */
+//  
+// namespace OCA\Encryption;
+// 
+// class Test_Stream extends \PHPUnit_Framework_TestCase {
+// 
+// 	function setUp() {
+// 	
+// 		\OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
+// 	
+// 		$this->empty = '';
+// 	
+// 		$this->stream = new Stream();
+// 		
+// 		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+// 		$this->dataShort = 'hats';
+// 		
+// 		$this->emptyTmpFilePath = \OCP\Files::tmpFile();
+// 		
+// 		$this->dataTmpFilePath = \OCP\Files::tmpFile();
+// 		
+// 		file_put_contents( $this->dataTmpFilePath, "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est." );
+// 	
+// 	}
+// 	
+// 	function testStreamOpen() {
+// 		
+// 		$stream1 = new Stream();
+// 		
+// 		$handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'wb', array(), $this->empty );
+// 		
+// 		// Test that resource was returned successfully
+// 		$this->assertTrue( $handle1 );
+// 		
+// 		// Test that file has correct size
+// 		$this->assertEquals( 0, $stream1->size );
+// 		
+// 		// Test that path is correct
+// 		$this->assertEquals( $this->emptyTmpFilePath, $stream1->rawPath );
+// 		
+// 		$stream2 = new Stream();
+// 		
+// 		$handle2 = $stream2->stream_open( 'crypt://' . $this->emptyTmpFilePath, 'wb', array(), $this->empty );
+// 		
+// 		// Test that protocol identifier is removed from path
+// 		$this->assertEquals( $this->emptyTmpFilePath, $stream2->rawPath );
+// 
+// 		// "Stat failed error" prevents this test from executing
+// // 		$stream3 = new Stream();
+// // 		
+// // 		$handle3 = $stream3->stream_open( $this->dataTmpFilePath, 'r', array(), $this->empty );
+// // 		
+// // 		$this->assertEquals( 0, $stream3->size );
+// 	
+// 	}
+// 	
+// 	function testStreamWrite() {
+// 		
+// 		$stream1 = new Stream();
+// 		
+// 		$handle1 = $stream1->stream_open( $this->emptyTmpFilePath, 'r+b', array(), $this->empty );
+// 		
+// 		# what about the keymanager? there is no key for the newly created temporary file!
+// 		
+// 		$stream1->stream_write( $this->dataShort );
+// 	
+// 	}
+// 
+// // 	function getStream( $id, $mode, $size ) {
+// // 	
+// // 		if ( $id === '' ) {
+// // 			
+// // 			$id = uniqid();
+// // 		}
+// // 		
+// // 		
+// // 		if ( !isset( $this->tmpFiles[$id] ) ) {
+// // 		
+// // 			// If tempfile with given name does not already exist, create it
+// // 			
+// // 			$file = OCP\Files::tmpFile();
+// // 			
+// // 			$this->tmpFiles[$id] = $file;
+// // 		
+// // 		} else {
+// // 		
+// // 			$file = $this->tmpFiles[$id];
+// // 		
+// // 		}
+// // 		
+// // 		$stream = fopen( $file, $mode );
+// // 		
+// // 		Stream::$sourceStreams[$id] = array( 'path' => 'dummy' . $id, 'stream' => $stream, 'size' => $size );
+// // 		
+// // 		return fopen( 'crypt://streams/'.$id, $mode );
+// // 	
+// // 	}
+// // 
+// // 	function testStream(  ){
+// // 
+// // 		$stream = $this->getStream( 'test1', 'w', strlen( 'foobar' ) );
+// // 
+// // 		fwrite( $stream, 'foobar' );
+// // 
+// // 		fclose( $stream );
+// // 
+// // 
+// // 		$stream = $this->getStream( 'test1', 'r', strlen( 'foobar' ) );
+// // 
+// // 		$data = fread( $stream, 6 );
+// // 
+// // 		fclose( $stream );
+// // 
+// // 		$this->assertEquals( 'foobar', $data );
+// // 
+// // 
+// // 		$file = OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// // 
+// // 		$source = fopen( $file, 'r' );
+// // 
+// // 		$target = $this->getStream( 'test2', 'w', 0 );
+// // 
+// // 		OCP\Files::streamCopy( $source, $target );
+// // 
+// // 		fclose( $target );
+// // 
+// // 		fclose( $source );
+// // 
+// // 
+// // 		$stream = $this->getStream( 'test2', 'r', filesize( $file ) );
+// // 
+// // 		$data = stream_get_contents( $stream );
+// // 
+// // 		$original = file_get_contents( $file );
+// // 
+// // 		$this->assertEquals( strlen( $original ), strlen( $data ) );
+// // 
+// // 		$this->assertEquals( $original, $data );
+// // 
+// // 	}
+// 
+// }
+// 
+// // class Test_CryptStream extends PHPUnit_Framework_TestCase {
+// // 	private $tmpFiles=array();
+// // 	
+// // 	function testStream(){
+// // 		$stream=$this->getStream('test1','w',strlen('foobar'));
+// // 		fwrite($stream,'foobar');
+// // 		fclose($stream);
+// // 
+// // 		$stream=$this->getStream('test1','r',strlen('foobar'));
+// // 		$data=fread($stream,6);
+// // 		fclose($stream);
+// // 		$this->assertEquals('foobar',$data);
+// // 
+// // 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
+// // 		$source=fopen($file,'r');
+// // 		$target=$this->getStream('test2','w',0);
+// // 		OCP\Files::streamCopy($source,$target);
+// // 		fclose($target);
+// // 		fclose($source);
+// // 
+// // 		$stream=$this->getStream('test2','r',filesize($file));
+// // 		$data=stream_get_contents($stream);
+// // 		$original=file_get_contents($file);
+// // 		$this->assertEquals(strlen($original),strlen($data));
+// // 		$this->assertEquals($original,$data);
+// // 	}
+// // 
+// // 	/**
+// // 	 * get a cryptstream to a temporary file
+// // 	 * @param string $id
+// // 	 * @param string $mode
+// // 	 * @param int size
+// // 	 * @return resource
+// // 	 */
+// // 	function getStream($id,$mode,$size){
+// // 		if($id===''){
+// // 			$id=uniqid();
+// // 		}
+// // 		if(!isset($this->tmpFiles[$id])){
+// // 			$file=OCP\Files::tmpFile();
+// // 			$this->tmpFiles[$id]=$file;
+// // 		}else{
+// // 			$file=$this->tmpFiles[$id];
+// // 		}
+// // 		$stream=fopen($file,$mode);
+// // 		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
+// // 		return fopen('crypt://streams/'.$id,$mode);
+// // 	}
+// // 
+// // 	function testBinary(){
+// // 		$file=__DIR__.'/binary';
+// // 		$source=file_get_contents($file);
+// // 
+// // 		$stream=$this->getStream('test','w',strlen($source));
+// // 		fwrite($stream,$source);
+// // 		fclose($stream);
+// // 
+// // 		$stream=$this->getStream('test','r',strlen($source));
+// // 		$data=stream_get_contents($stream);
+// // 		fclose($stream);
+// // 		$this->assertEquals(strlen($data),strlen($source));
+// // 		$this->assertEquals($source,$data);
+// // 
+// // 		$file=__DIR__.'/zeros';
+// // 		$source=file_get_contents($file);
+// // 
+// // 		$stream=$this->getStream('test2','w',strlen($source));
+// // 		fwrite($stream,$source);
+// // 		fclose($stream);
+// // 
+// // 		$stream=$this->getStream('test2','r',strlen($source));
+// // 		$data=stream_get_contents($stream);
+// // 		fclose($stream);
+// // 		$this->assertEquals(strlen($data),strlen($source));
+// // 		$this->assertEquals($source,$data);
+// // 	}
+// // }
diff --git a/apps/files_encryption/test/util.php b/apps/files_encryption/test/util.php
new file mode 100755
index 0000000000000000000000000000000000000000..a299ec67f598644cb739300ba9f2308164b01d21
--- /dev/null
+++ b/apps/files_encryption/test/util.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+//require_once "PHPUnit/Framework/TestCase.php";
+require_once realpath( dirname(__FILE__).'/../../../lib/base.php' );
+require_once realpath( dirname(__FILE__).'/../lib/crypt.php' );
+require_once realpath( dirname(__FILE__).'/../lib/keymanager.php' );
+require_once realpath( dirname(__FILE__).'/../lib/proxy.php' );
+require_once realpath( dirname(__FILE__).'/../lib/stream.php' );
+require_once realpath( dirname(__FILE__).'/../lib/util.php' );
+require_once realpath( dirname(__FILE__).'/../appinfo/app.php' );
+
+// Load mockery files
+require_once 'Mockery/Loader.php';
+require_once 'Hamcrest/Hamcrest.php';
+$loader = new \Mockery\Loader;
+$loader->register();
+
+use \Mockery as m;
+use OCA\Encryption;
+
+class Test_Enc_Util extends \PHPUnit_Framework_TestCase {
+	
+	function setUp() {
+	
+		\OC_Filesystem::mount( 'OC_Filestorage_Local', array(), '/' );
+		
+		// set content for encrypting / decrypting in tests
+		$this->dataUrl = realpath( dirname(__FILE__).'/../lib/crypt.php' );
+		$this->dataShort = 'hats';
+		$this->dataLong = file_get_contents( realpath( dirname(__FILE__).'/../lib/crypt.php' ) );
+		$this->legacyData = realpath( dirname(__FILE__).'/legacy-text.txt' );
+		$this->legacyEncryptedData = realpath( dirname(__FILE__).'/legacy-encrypted-text.txt' );
+		
+		$this->userId = 'admin';
+		$this->pass = 'admin';
+		
+		$keypair = Encryption\Crypt::createKeypair();
+		
+		$this->genPublicKey =  $keypair['publicKey'];
+		$this->genPrivateKey = $keypair['privateKey'];
+		
+		$this->publicKeyDir =  '/' . 'public-keys';
+		$this->encryptionDir =  '/' . $this->userId . '/' . 'files_encryption';
+		$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+		$this->publicKeyPath = $this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+		$this->privateKeyPath = $this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+		
+		$this->view = new OC_FilesystemView( '/admin' );
+		
+		$this->mockView = m::mock('OC_FilesystemView');
+		$this->util = new Encryption\Util( $this->mockView, $this->userId );
+	
+	}
+	
+	function tearDown(){
+	
+		m::close();
+	
+	}
+	
+	/**
+	 * @brief test that paths set during User construction are correct
+	 */
+	function testKeyPaths() {
+	
+		$mockView = m::mock('OC_FilesystemView');
+		
+		$util = new Encryption\Util( $mockView, $this->userId );
+		
+		$this->assertEquals( $this->publicKeyDir, $util->getPath( 'publicKeyDir' ) );
+		$this->assertEquals( $this->encryptionDir, $util->getPath( 'encryptionDir' ) );
+		$this->assertEquals( $this->keyfilesPath, $util->getPath( 'keyfilesPath' ) );
+		$this->assertEquals( $this->publicKeyPath, $util->getPath( 'publicKeyPath' ) );
+		$this->assertEquals( $this->privateKeyPath, $util->getPath( 'privateKeyPath' ) );
+	
+	}
+	
+	/**
+	 * @brief test setup of encryption directories when they don't yet exist
+	 */
+	function testSetupServerSideNotSetup() {
+	
+		$mockView = m::mock('OC_FilesystemView');
+		
+		$mockView->shouldReceive( 'file_exists' )->times(4)->andReturn( false );
+		$mockView->shouldReceive( 'mkdir' )->times(3)->andReturn( true );
+		$mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
+		
+		$util = new Encryption\Util( $mockView, $this->userId );
+		
+		$this->assertEquals( true, $util->setupServerSide( $this->pass ) );
+	
+	}
+	
+	/**
+	 * @brief test setup of encryption directories when they already exist
+	 */
+	function testSetupServerSideIsSetup() {
+	
+		$mockView = m::mock('OC_FilesystemView');
+		
+		$mockView->shouldReceive( 'file_exists' )->times(5)->andReturn( true );
+		$mockView->shouldReceive( 'file_put_contents' )->withAnyArgs();
+		
+		$util = new Encryption\Util( $mockView, $this->userId );
+		
+		$this->assertEquals( true, $util->setupServerSide( $this->pass ) );
+		
+	}
+	
+	/**
+	 * @brief test checking whether account is ready for encryption, when it isn't ready
+	 */
+	function testReadyNotReady() {
+	
+		$mockView = m::mock('OC_FilesystemView');
+		
+		$mockView->shouldReceive( 'file_exists' )->times(1)->andReturn( false );
+		
+		$util = new Encryption\Util( $mockView, $this->userId );
+		
+		$this->assertEquals( false, $util->ready() );
+		
+		# TODO: Add more tests here to check that if any of the dirs are 
+		# then false will be returned. Use strict ordering?
+		
+	}
+	
+	/**
+	 * @brief test checking whether account is ready for encryption, when it is ready
+	 */
+	function testReadyIsReady() {
+	
+		$mockView = m::mock('OC_FilesystemView');
+		
+		$mockView->shouldReceive( 'file_exists' )->times(3)->andReturn( true );
+		
+		$util = new Encryption\Util( $mockView, $this->userId );
+		
+		$this->assertEquals( true, $util->ready() );
+		
+		# TODO: Add more tests here to check that if any of the dirs are 
+		# then false will be returned. Use strict ordering?
+		
+	}
+
+// 	/**
+// 	 * @brief test decryption using legacy blowfish method
+// 	 * @depends testLegacyEncryptLong
+// 	 */
+// 	function testLegacyKeyRecryptKeyfileDecrypt( $recrypted ) {
+// 	
+// 		$decrypted = Encryption\Crypt::keyDecryptKeyfile( $recrypted['data'], $recrypted['key'], $this->genPrivateKey );
+// 		
+// 		$this->assertEquals( $this->dataLong, $decrypted );
+// 		
+// 	}
+	
+//	// Cannot use this test for now due to hidden dependencies in OC_FileCache
+// 	function testIsLegacyEncryptedContent() {
+// 		
+// 		$keyfileContent = OCA\Encryption\Crypt::symmetricEncryptFileContent( $this->legacyEncryptedData, 'hat' );
+// 		
+// 		$this->assertFalse( OCA\Encryption\Crypt::isLegacyEncryptedContent( $keyfileContent, '/files/admin/test.txt' ) );
+// 		
+// 		OC_FileCache::put( '/admin/files/legacy-encrypted-test.txt', $this->legacyEncryptedData );
+// 		
+// 		$this->assertTrue( OCA\Encryption\Crypt::isLegacyEncryptedContent( $this->legacyEncryptedData, '/files/admin/test.txt' ) );
+// 		
+// 	}
+
+//	// Cannot use this test for now due to need for different root in OC_Filesystem_view class
+// 	function testGetLegacyKey() {
+// 		
+// 		$c = new \OCA\Encryption\Util( $view, false );
+// 
+// 		$bool = $c->getLegacyKey( 'admin' );
+//
+//		$this->assertTrue( $bool );
+// 		
+// 		$this->assertTrue( $c->legacyKey );
+// 		
+// 		$this->assertTrue( is_int( $c->legacyKey ) );
+// 		
+// 		$this->assertTrue( strlen( $c->legacyKey ) == 20 );
+//	
+// 	}
+
+//	// Cannot use this test for now due to need for different root in OC_Filesystem_view class
+// 	function testLegacyDecrypt() {
+// 
+// 		$c = new OCA\Encryption\Util( $this->view, false );
+// 		
+// 		$bool = $c->getLegacyKey( 'admin' );
+// 
+// 		$encrypted = $c->legacyEncrypt( $this->data, $c->legacyKey );
+// 		
+// 		$decrypted = $c->legacyDecrypt( $encrypted, $c->legacyKey );
+// 
+// 		$this->assertEquals( $decrypted, $this->data );
+// 	
+// 	}
+
+}
\ No newline at end of file
diff --git a/apps/files_encryption/tests/zeros b/apps/files_encryption/test/zeros
similarity index 100%
rename from apps/files_encryption/tests/zeros
rename to apps/files_encryption/test/zeros
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
deleted file mode 100644
index 0e119f55bea1b6c4cd2b88cd3829eb046259b330..0000000000000000000000000000000000000000
--- a/apps/files_encryption/tests/encryption.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_Encryption extends UnitTestCase {
-	function testEncryption() {
-		$key=uniqid();
-		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-		$source=file_get_contents($file); //nice large text file
-		$encrypted=OC_Crypt::encrypt($source, $key);
-		$decrypted=OC_Crypt::decrypt($encrypted, $key);
-		$decrypted=rtrim($decrypted, "\0");
-		$this->assertNotEqual($encrypted, $source);
-		$this->assertEqual($decrypted, $source);
-
-		$chunk=substr($source, 0, 8192);
-		$encrypted=OC_Crypt::encrypt($chunk, $key);
-		$this->assertEqual(strlen($chunk), strlen($encrypted));
-		$decrypted=OC_Crypt::decrypt($encrypted, $key);
-		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted, $chunk);
-
-		$encrypted=OC_Crypt::blockEncrypt($source, $key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
-		$this->assertNotEqual($encrypted, $source);
-		$this->assertEqual($decrypted, $source);
-
-		$tmpFileEncrypted=OCP\Files::tmpFile();
-		OC_Crypt::encryptfile($file, $tmpFileEncrypted, $key);
-		$encrypted=file_get_contents($tmpFileEncrypted);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
-		$this->assertNotEqual($encrypted, $source);
-		$this->assertEqual($decrypted, $source);
-
-		$tmpFileDecrypted=OCP\Files::tmpFile();
-		OC_Crypt::decryptfile($tmpFileEncrypted, $tmpFileDecrypted, $key);
-		$decrypted=file_get_contents($tmpFileDecrypted);
-		$this->assertEqual($decrypted, $source);
-
-		$file=OC::$SERVERROOT.'/core/img/weather-clear.png';
-		$source=file_get_contents($file); //binary file
-		$encrypted=OC_Crypt::encrypt($source, $key);
-		$decrypted=OC_Crypt::decrypt($encrypted, $key);
-		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted, $source);
-
-		$encrypted=OC_Crypt::blockEncrypt($source, $key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
-		$this->assertEqual($decrypted, $source);
-
-	}
-
-	function testBinary() {
-		$key=uniqid();
-
-		$file=__DIR__.'/binary';
-		$source=file_get_contents($file); //binary file
-		$encrypted=OC_Crypt::encrypt($source, $key);
-		$decrypted=OC_Crypt::decrypt($encrypted, $key);
-
-		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted, $source);
-
-		$encrypted=OC_Crypt::blockEncrypt($source, $key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key, strlen($source));
-		$this->assertEqual($decrypted, $source);
-	}
-}
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
deleted file mode 100644
index 5aa617e7472b00d5da4651e93ca61d75ded6463b..0000000000000000000000000000000000000000
--- a/apps/files_encryption/tests/proxy.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_CryptProxy extends UnitTestCase {
-	private $oldConfig;
-	private $oldKey;
-
-	public function setUp() {
-		$user=OC_User::getUser();
-
-		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption', 'true');
-		OCP\Config::setAppValue('files_encryption', 'enable_encryption', 'true');
-		$this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
-
-
-		//set testing key
-		$_SESSION['enckey']=md5(time());
-
-		//clear all proxies and hooks so we can do clean testing
-		OC_FileProxy::clearProxies();
-		OC_Hook::clear('OC_Filesystem');
-
-		//enable only the encryption hook
-		OC_FileProxy::register(new OC_FileProxy_Encryption());
-
-		//set up temporary storage
-		OC_Filesystem::clearMounts();
-		OC_Filesystem::mount('OC_Filestorage_Temporary', array(), '/');
-
-		OC_Filesystem::init('/'.$user.'/files');
-
-		//set up the users home folder in the temp storage
-		$rootView=new OC_FilesystemView('');
-		$rootView->mkdir('/'.$user);
-		$rootView->mkdir('/'.$user.'/files');
-	}
-
-	public function tearDown() {
-		OCP\Config::setAppValue('files_encryption', 'enable_encryption', $this->oldConfig);
-		if ( ! is_null($this->oldKey)) {
-			$_SESSION['enckey']=$this->oldKey;
-		}
-	}
-
-	public function testSimple() {
-		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-		$original=file_get_contents($file);
-
-		OC_Filesystem::file_put_contents('/file', $original);
-
-		OC_FileProxy::$enabled=false;
-		$stored=OC_Filesystem::file_get_contents('/file');
-		OC_FileProxy::$enabled=true;
-
-		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original, $stored);
-		$this->assertEqual(strlen($original), strlen($fromFile));
-		$this->assertEqual($original, $fromFile);
-
-	}
-
-	public function testView() {
-		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-		$original=file_get_contents($file);
-
-		$rootView=new OC_FilesystemView('');
-		$view=new OC_FilesystemView('/'.OC_User::getUser());
-		$userDir='/'.OC_User::getUser().'/files';
-
-		$rootView->file_put_contents($userDir.'/file', $original);
-
-		OC_FileProxy::$enabled=false;
-		$stored=$rootView->file_get_contents($userDir.'/file');
-		OC_FileProxy::$enabled=true;
-
-		$this->assertNotEqual($original, $stored);
-		$fromFile=$rootView->file_get_contents($userDir.'/file');
-		$this->assertEqual($original, $fromFile);
-
-		$fromFile=$view->file_get_contents('files/file');
-		$this->assertEqual($original, $fromFile);
-	}
-
-	public function testBinary() {
-		$file=__DIR__.'/binary';
-		$original=file_get_contents($file);
-
-		OC_Filesystem::file_put_contents('/file', $original);
-
-		OC_FileProxy::$enabled=false;
-		$stored=OC_Filesystem::file_get_contents('/file');
-		OC_FileProxy::$enabled=true;
-
-		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original, $stored);
-		$this->assertEqual(strlen($original), strlen($fromFile));
-		$this->assertEqual($original, $fromFile);
-
-		$file=__DIR__.'/zeros';
-		$original=file_get_contents($file);
-
-		OC_Filesystem::file_put_contents('/file', $original);
-
-		OC_FileProxy::$enabled=false;
-		$stored=OC_Filesystem::file_get_contents('/file');
-		OC_FileProxy::$enabled=true;
-
-		$fromFile=OC_Filesystem::file_get_contents('/file');
-		$this->assertNotEqual($original, $stored);
-		$this->assertEqual(strlen($original), strlen($fromFile));
-	}
-}
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
deleted file mode 100644
index e4af17d47b5b404cc0ab169c255921d76b210170..0000000000000000000000000000000000000000
--- a/apps/files_encryption/tests/stream.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_CryptStream extends UnitTestCase {
-	private $tmpFiles=array();
-
-	function testStream() {
-		$stream=$this->getStream('test1', 'w', strlen('foobar'));
-		fwrite($stream, 'foobar');
-		fclose($stream);
-
-		$stream=$this->getStream('test1', 'r', strlen('foobar'));
-		$data=fread($stream, 6);
-		fclose($stream);
-		$this->assertEqual('foobar', $data);
-
-		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-		$source=fopen($file, 'r');
-		$target=$this->getStream('test2', 'w', 0);
-		OCP\Files::streamCopy($source, $target);
-		fclose($target);
-		fclose($source);
-
-		$stream=$this->getStream('test2', 'r', filesize($file));
-		$data=stream_get_contents($stream);
-		$original=file_get_contents($file);
-		$this->assertEqual(strlen($original), strlen($data));
-		$this->assertEqual($original, $data);
-	}
-
-	/**
-	 * get a cryptstream to a temporary file
-	 * @param string $id
-	 * @param string $mode
-	 * @param int size
-	 * @return resource
-	 */
-	function getStream($id, $mode, $size) {
-		if ($id==='') {
-			$id=uniqid();
-		}
-		if ( ! isset($this->tmpFiles[$id])) {
-			$file=OCP\Files::tmpFile();
-			$this->tmpFiles[$id]=$file;
-		} else {
-			$file=$this->tmpFiles[$id];
-		}
-		$stream=fopen($file, $mode);
-		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id, 'stream'=>$stream, 'size'=>$size);
-		return fopen('crypt://streams/'.$id, $mode);
-	}
-
-	function testBinary() {
-		$file=__DIR__.'/binary';
-		$source=file_get_contents($file);
-
-		$stream=$this->getStream('test', 'w', strlen($source));
-		fwrite($stream, $source);
-		fclose($stream);
-
-		$stream=$this->getStream('test', 'r', strlen($source));
-		$data=stream_get_contents($stream);
-		fclose($stream);
-		$this->assertEqual(strlen($data), strlen($source));
-		$this->assertEqual($source, $data);
-
-		$file=__DIR__.'/zeros';
-		$source=file_get_contents($file);
-
-		$stream=$this->getStream('test2', 'w', strlen($source));
-		fwrite($stream, $source);
-		fclose($stream);
-
-		$stream=$this->getStream('test2', 'r', strlen($source));
-		$data=stream_get_contents($stream);
-		fclose($stream);
-		$this->assertEqual(strlen($data), strlen($source));
-		$this->assertEqual($source, $data);
-	}
-}
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
index 6a152786808758dd599dada17c64a4ad30f63a85..ca2c9f7e5c8c0eda8e01380f9b5fd7e5569b2272 100644
--- a/apps/files_external/l10n/ro.php
+++ b/apps/files_external/l10n/ro.php
@@ -1,4 +1,12 @@
 <?php $TRANSLATIONS = array(
+"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",
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
index 70ab8d3348566df40a632bebbaf8ed809db220ee..870995c8e7a111b29725c696f7b8a7e62531c4c2 100644
--- a/apps/files_external/l10n/th_TH.php
+++ b/apps/files_external/l10n/th_TH.php
@@ -5,6 +5,8 @@
 "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" => "à¸”à¹‰à¸²à¸™à¸«à¸¥à¸±à¸‡à¸£à¸°à¸šà¸š",
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 235ade06db6271044456ecbbc89acc3015a42bbe..e5ef4eb097c10e3e5258cc4a563bd2867d59ddcc 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -108,7 +108,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 			$stat['atime'] = time();
 			$stat['mtime'] = $stat['atime'];
 			$stat['ctime'] = $stat['atime'];
-		} else { 
+		} else {
 			$object = $this->getObject($path);
 			if ($object) {
 				$stat['size'] = $object['Size'];
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 1be544fbc075f114f1b409f73c9bb55e58b43c2e..fd3dc2ca0d0af2cbe6ef835c37507be48e612898 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_Filestorage_Local']=array(
 				'backend' => 'Local',
 				'configuration' => array(
@@ -77,7 +77,7 @@ class OC_Mount_Config {
 				'token' => '#token',
 				'token_secret' => '#token secret'),
 				'custom' => 'google');
-		
+
 		$backends['OC_Filestorage_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_Filestorage_SMB']=array(
 			'backend' => 'SMB / CIFS',
 			'configuration' => array(
@@ -95,7 +95,7 @@ class OC_Mount_Config {
 				'password' => '*Password',
 				'share' => 'Share',
 				'root' => '&Root'));
-				
+
 		$backends['OC_Filestorage_DAV']=array(
 			'backend' => 'ownCloud / WebDAV',
 			'configuration' => array(
@@ -103,7 +103,7 @@ class OC_Mount_Config {
 				'user' => 'Username',
 				'password' => '*Password',
 				'root' => '&Root',
-				'secure' => '!Secure https://'));	
+				'secure' => '!Secure https://'));
 
 		return($backends);
 	}
@@ -403,7 +403,7 @@ class OC_Mount_Config {
 	}
 
 	/**
-	 * check if smbclient is installed 
+	 * check if smbclient is installed
 	 */
 	public static function checksmbclient() {
 		if(function_exists('shell_exec')) {
@@ -415,7 +415,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')) {
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 6c5bc579c30ea05326d2fb5ee54009d51f24af53..920aefc12dee703e0f9cd4d9f4dc4510df5d1200 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -234,12 +234,11 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$path1=$this->cleanPath($path1);
 		$path2=$this->root.$this->cleanPath($path2);
 		try {
-			$response=$this->client->request('MOVE', $path1, null, array('Destination'=>$path2));
+			$this->client->request('MOVE', $path1, null, array('Destination'=>$path2));
 			return true;
 		} catch(Exception $e) {
 			echo $e;
 			echo 'fail';
-			var_dump($response);
 			return false;
 		}
 	}
@@ -248,12 +247,11 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$path1=$this->cleanPath($path1);
 		$path2=$this->root.$this->cleanPath($path2);
 		try {
-			$response=$this->client->request('COPY', $path1, null, array('Destination'=>$path2));
+			$this->client->request('COPY', $path1, null, array('Destination'=>$path2));
 			return true;
 		} catch(Exception $e) {
 			echo $e;
 			echo 'fail';
-			var_dump($response);
 			return false;
 		}
 	}
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index dd537d779a66731ee898f1d408a41e94076bbc34..78ca1c87feefa3f1b22648bc4484fbfbb7ad2c6b 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,7 +1,7 @@
 <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'].''; ?>
+		<?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?>
 		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
@@ -47,7 +47,7 @@
 									<?php elseif (strpos($placeholder, '!') !== false): ?>
 										<label><input type="checkbox"
 													  data-parameter="<?php echo $parameter; ?>"
-													  <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?> 
+													  <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?>
 													  /><?php echo substr($placeholder, 1); ?></label>
 									<?php elseif (strpos($placeholder, '&') !== false): ?>
 										<input type="text"
@@ -105,7 +105,7 @@
 					<?php endif; ?>
 					<td <?php if ($mountPoint != ''): ?>class="remove"
 						<?php else: ?>style="visibility:hidden;"
-						<?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>" 
+						<?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>"
 											title="<?php echo $l->t('Delete'); ?>"
 											class="svg action"
 											src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index d0404b5f34cdbf11e7618a62c1bfeaf9ea03f8b3..91e4589ed184d10daa41cf1e2af6a5a1b8245bb6 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -32,18 +32,18 @@ class Test_Filestorage_FTP extends Test_FileStorage {
 						  'root' => '/',
 						  'secure' => false );
 		$instance = new OC_Filestorage_FTP($config);
-		$this->assertEqual('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
+		$this->assertEquals('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
 
 		$config['secure'] = true;
 		$instance = new OC_Filestorage_FTP($config);
-		$this->assertEqual('ftps://ftp:ftp@localhost/', $instance->constructUrl(''));
+		$this->assertEquals('ftps://ftp:ftp@localhost/', $instance->constructUrl(''));
 
 		$config['secure'] = 'false';
 		$instance = new OC_Filestorage_FTP($config);
-		$this->assertEqual('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
+		$this->assertEquals('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
 
 		$config['secure'] = 'true';
 		$instance = new OC_Filestorage_FTP($config);
-		$this->assertEqual('ftps://ftp:ftp@localhost/', $instance->constructUrl(''));
+		$this->assertEquals('ftps://ftp:ftp@localhost/', $instance->constructUrl(''));
 	}
 }
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 8a546d62163d8ffa520d92eda8f8a6b86108844e..eb5a6e8cb7fe27e001353a3e348757e60b4638a9 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,7 +1,9 @@
 $(document).ready(function() {
 
-	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined'  && !publicListView) {
-		
+	var disableSharing = $('#disableSharing').data('status');
+
+	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined'  && !disableSharing) {
+
 		FileActions.register('all', 'Share', OC.PERMISSION_READ, OC.imagePath('core', 'actions/share'), function(filename) {
 			if ($('#dir').val() == '/') {
 				var item = $('#dir').val() + filename;
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
new file mode 100644
index 0000000000000000000000000000000000000000..8aba5806aa03c9ece3e8630f7e065da5a293c302
--- /dev/null
+++ b/apps/files_sharing/l10n/lb.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Passwuert"
+);
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
new file mode 100644
index 0000000000000000000000000000000000000000..7a922b890028cf5c2f03e89f89aa52522e915901
--- /dev/null
+++ b/apps/files_sharing/l10n/sr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Submit" => "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸"
+);
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
index fa4f8075c6e4fb146454efe5ab987df7aaf5e53d..f1d28731a7fc78f11f3f48033e64cbd4423d63ba 100644
--- a/apps/files_sharing/l10n/zh_TW.php
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -4,5 +4,6 @@
 "%s shared the folder %s with you" => "%s åˆ†äº«äº†è³‡æ–™å¤¾ %s çµ¦æ‚¨",
 "%s shared the file %s with you" => "%s åˆ†äº«äº†æª”æ¡ˆ %s çµ¦æ‚¨",
 "Download" => "ä¸‹è¼‰",
-"No preview available for" => "ç„¡æ³•é è¦½"
+"No preview available for" => "ç„¡æ³•é è¦½",
+"web services under your control" => "åœ¨æ‚¨æŽŒæŽ§ä¹‹ä¸‹çš„ç¶²è·¯æœå‹™"
 );
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 487b9e79961b6fb1a734012cac2433d3ee0432fe..5672c78dc33bb0ce6027016d32af765f9c2afcac 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -66,12 +66,12 @@ if (isset($_GET['t'])) {
 		$type = $linkItem['item_type'];
 		$fileSource = $linkItem['file_source'];
 		$shareOwner = $linkItem['uid_owner'];
-		
+
 		if (OCP\User::userExists($shareOwner) && $fileSource != -1 ) {
-			
+
 			$pathAndUser = getPathAndUser($linkItem['file_source']);
 			$fileOwner = $pathAndUser['user'];
-			
+
 			//if this is a reshare check the file owner also exists
 			if ($shareOwner != $fileOwner && ! OCP\User::userExists($fileOwner)) {
 					OCP\Util::writeLog('share', 'original file owner '.$fileOwner
@@ -81,7 +81,7 @@ if (isset($_GET['t'])) {
 					$tmpl->printPage();
 					exit();
 			}
-			
+
 			//mount filesystem of file owner
 			OC_Util::setupFS($fileOwner);
 		}
@@ -104,7 +104,7 @@ if (isset($_GET['t'])) {
 		}
 	}
 	$shareOwner = substr($path, 1, strpos($path, '/', 1) - 1);
-	
+
 	if (OCP\User::userExists($shareOwner)) {
 		OC_Util::setupFS($shareOwner);
 		$fileSource = getId($path);
@@ -159,7 +159,7 @@ if ($linkItem) {
 				$tmpl->printPage();
 				exit();
 			}
-		
+
 		} else {
 			// Check if item id is set in session
 			if (!isset($_SESSION['public_link_authenticated'])
@@ -207,6 +207,7 @@ if ($linkItem) {
 		OCP\Util::addScript('files', 'fileactions');
 		$tmpl = new OCP\Template('files_sharing', 'public', 'base');
 		$tmpl->assign('uidOwner', $shareOwner);
+		$tmpl->assign('displayName', \OCP\User::getDisplayName($shareOwner));
 		$tmpl->assign('dir', $dir);
 		$tmpl->assign('filename', $file);
 		$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
@@ -257,7 +258,7 @@ if ($linkItem) {
 
 			$list = new OCP\Template('files', 'part.list', '');
 			$list->assign('files', $files, false);
-			$list->assign('publicListView', true);
+			$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);
 			$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '' );
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 647e1e08a31e4e511f21daa15d915bd34b793b51..71fca09ed6d9b3147f081a29147fc9f5b4916e62 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,11 +1,3 @@
-<script type="text/javascript">
-	<?php if ( array_key_exists('publicListView', $_) && $_['publicListView'] == true ) {
-		echo "var publicListView = true;";
-	} else {
-		echo "var publicListView = false;";
-	}
-	?>
-</script>
 <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">
@@ -14,9 +6,9 @@
 	<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>
 	<div class="header-right">
 	<?php if (isset($_['folder'])): ?>
-		<span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['uidOwner'], $_['filename'])) ?></span>
+		<span id="details"><?php echo $l->t('%s shared the folder %s with you', array($_['displayName'], $_['filename'])) ?></span>
 	<?php else: ?>
-		<span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['uidOwner'], $_['filename'])) ?></span>
+		<span id="details"><?php echo $l->t('%s shared the file %s with you', array($_['displayName'], $_['filename'])) ?></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>
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 6e27f43d576aebdcccf3c63e120176986a5ac868..6071240e58320c9572742a6185efc1f224885d52 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -28,7 +28,6 @@ $tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
 if ( isset( $_GET['path'] ) ) {
 
 	$path = $_GET['path'];
-	$path = $path;
 	$tmpl->assign( 'path', $path );
 	$versions = new OCA_Versions\Storage();
 
diff --git a/apps/files_versions/l10n/ar.php b/apps/files_versions/l10n/ar.php
index fea7f1c7562a4ac5b923ea66877e872f401e9d2d..1f1f3100405941888a419eb9dcf8fff0c7496af4 100644
--- a/apps/files_versions/l10n/ar.php
+++ b/apps/files_versions/l10n/ar.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Ø¥Ù†Ù‡Ø§Ø¡ ØªØ§Ø±ÙŠØ® Ø§Ù„Ø¥Ù†ØªÙ‡Ø§Ø¡ Ù„Ø¬Ù…ÙŠØ¹ Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª",
 "History" => "Ø§Ù„Ø³Ø¬Ù„ Ø§Ù„Ø²Ù…Ù†ÙŠ",
-"Versions" => "Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª",
-"This will delete all existing backup versions of your files" => "Ù‡Ø°Ù‡ Ø§Ù„Ø¹Ù…Ù„ÙŠØ© Ø³ØªÙ‚ÙˆÙ… Ø¨Ø¥Ù„ØºØ§Ø¡ Ø¬Ù…ÙŠØ¹ Ø¥ØµØ¯Ø§Ø±Ø§Øª Ø§Ù„Ù†Ø³Ø® Ø§Ù„Ø§ØØªÙŠØ§Ø·ÙŠ Ù„Ù„Ù…Ù„ÙØ§Øª",
 "Files Versioning" => "Ø£ØµØ¯Ø±Ø© Ø§Ù„Ù…Ù„ÙØ§Øª",
 "Enable" => "ØªÙØ¹ÙŠÙ„"
 );
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
index 98b5f4113ae649f6426b7c426e7c21da71485958..6ecf12d0b00c50686c7a413e339db78a6e3c764b 100644
--- a/apps/files_versions/l10n/bg_BG.php
+++ b/apps/files_versions/l10n/bg_BG.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
 "History" => "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ",
-"Versions" => "Ð’ÐµÑ€ÑÐ¸Ð¸",
-"This will delete all existing backup versions of your files" => "Ð¢Ð¾Ð²Ð° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ñ‰Ðµ Ð¸Ð·Ñ‚Ñ€Ð¸Ðµ Ð²ÑÐ¸Ñ‡ÐºÐ¸ Ð½Ð°Ð»Ð¸Ñ‡Ð½Ð¸ Ð°Ñ€Ñ…Ð¸Ð²Ð½Ð¸ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½Ð° Ð’Ð°ÑˆÐ¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ",
 "Enable" => "Ð’ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾"
 );
diff --git a/apps/files_versions/l10n/bn_BD.php b/apps/files_versions/l10n/bn_BD.php
index 88349342fa9c87083f8a6ad1454a8b9996e1b0d3..dffa4d79a06f72c21afa13fd361bb5041512aa1e 100644
--- a/apps/files_versions/l10n/bn_BD.php
+++ b/apps/files_versions/l10n/bn_BD.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "à¦¸à¦®à¦¸à§à¦¤ à¦à¦¾à¦°à§à¦¸à¦¨ à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£",
 "History" => "à¦‡à¦¤à¦¿à¦¹à¦¾à¦¸",
-"Versions" => "à¦à¦¾à¦°à§à¦¸à¦¨",
-"This will delete all existing backup versions of your files" => "à¦à¦Ÿà¦¿ à¦†à¦ªà¦¨à¦¾à¦° à¦¬à¦¿à¦¦à§à¦¯à¦®à¦¾à¦¨  à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¸à¦®à¦¸à§à¦¤ à¦¬à§à¦¯à¦¾à¦•-à¦†à¦ª à¦à¦¾à¦°à§à¦¸à¦¨ à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¬à§‡à¥¤",
 "Files Versioning" => "à¦«à¦¾à¦‡à¦² à¦à¦¾à¦°à§à¦¸à¦¨ à¦•à¦°à¦¾",
 "Enable" => "à¦¸à¦•à§à¦°à¦¿à§Ÿ "
 );
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index 0076d02992f910fb9a1c7f28856592aa82df94da..01e0a116873ae558685316cf0dd2e9522ee15e60 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Expira totes les versions",
 "History" => "Historial",
-"Versions" => "Versions",
-"This will delete all existing backup versions of your files" => "AixÃ² eliminarÃ  totes les versions de cÃ²pia de seguretat dels vostres fitxers",
 "Files Versioning" => "Fitxers de Versions",
 "Enable" => "Habilita"
 );
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index 3995334d9ee230b4012c5bdc42b9baa4cb3f2c7a..d219c3e68daea5c2f6b14ffa182c1d5ed580af1f 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "VyprÅ¡et vÅ¡echny verze",
 "History" => "Historie",
-"Versions" => "Verze",
-"This will delete all existing backup versions of your files" => "OdstranÃ vÅ¡echny existujÃcÃ zÃ¡lohovanÃ© verze VaÅ¡ich souborÅ¯",
 "Files Versioning" => "VerzovÃ¡nÃ souborÅ¯",
 "Enable" => "Povolit"
 );
diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php
index bc02b47f2ad4fda3207bd590948280b9c806abd7..985797476439ed9074b3a24d57d4ed8aaddcd32b 100644
--- a/apps/files_versions/l10n/da.php
+++ b/apps/files_versions/l10n/da.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Lad alle versioner udlÃ¸be",
 "History" => "Historik",
-"Versions" => "Versioner",
-"This will delete all existing backup versions of your files" => "Dette vil slette alle eksisterende backupversioner af dine filer",
 "Files Versioning" => "Versionering af filer",
 "Enable" => "Aktiver"
 );
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index 092bbfbff70eeccf83fb66f5a160c35aa47fff24..2fcb996de7bae035700e178be957b88e65c44bc7 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Alle Versionen lÃ¶schen",
 "History" => "Historie",
-"Versions" => "Versionen",
-"This will delete all existing backup versions of your files" => "Dies lÃ¶scht alle vorhandenen Sicherungsversionen Deiner Dateien.",
 "Files Versioning" => "Dateiversionierung",
 "Enable" => "Aktivieren"
 );
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
index a568112d02db19d2f1cc1561ce743b0fc22dd3e9..2fcb996de7bae035700e178be957b88e65c44bc7 100644
--- a/apps/files_versions/l10n/de_DE.php
+++ b/apps/files_versions/l10n/de_DE.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Alle Versionen lÃ¶schen",
 "History" => "Historie",
-"Versions" => "Versionen",
-"This will delete all existing backup versions of your files" => "Dies lÃ¶scht alle vorhandenen Sicherungsversionen Ihrer Dateien.",
 "Files Versioning" => "Dateiversionierung",
 "Enable" => "Aktivieren"
 );
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
index f6b9a5b2998de835eaa04cb79c72eb8d427e575b..6b189c2cdd398168d89a99c53f1b90cccfa73253 100644
--- a/apps/files_versions/l10n/el.php
+++ b/apps/files_versions/l10n/el.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Î›Î®Î¾Î· ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ ÎµÎºÎ´ÏŒÏƒÎµÏ‰Î½",
 "History" => "Î™ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ",
-"Versions" => "Î•ÎºÎ´ÏŒÏƒÎµÎ¹Ï‚",
-"This will delete all existing backup versions of your files" => "Î‘Ï…Ï„ÏŒ Î¸Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÎ¹ ÏŒÎ»ÎµÏ‚ Ï„Î¹Ï‚ Ï…Ï€Î¬ÏÏ‡Î¿Ï…ÏƒÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Ï„Ï‰Î½ Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Ï‰Î½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎ±Ï‚",
 "Files Versioning" => "Î•ÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Î‘ÏÏ‡ÎµÎ¯Ï‰Î½",
 "Enable" => "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 );
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index 0c3835373ef19f659619a00cd5a015d2283b74c7..87b314655c0d48f8f5cc7143c96ebd6737b402e5 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Eksvalidigi Ä‰iujn eldonojn",
 "History" => "Historio",
-"Versions" => "Eldonoj",
-"This will delete all existing backup versions of your files" => "Äˆi tio forigos Ä‰iujn estantajn sekurkopiajn eldonojn de viaj dosieroj",
 "Files Versioning" => "Dosiereldonigo",
 "Enable" => "Kapabligi"
 );
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index f6b63df7c2b5484d72733cd0bf968f19106a7208..4a8c34e518081a2891fff577419c1d2af91266e6 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas las versiones",
 "History" => "Historial",
-"Versions" => "Versiones",
-"This will delete all existing backup versions of your files" => "Esto eliminarÃ¡ todas las versiones guardadas como copia de seguridad de tus archivos",
 "Files Versioning" => "Versionado de archivos",
 "Enable" => "Habilitar"
 );
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
index a78264de03fdb55bb6b082dc2d63ba42cbbc58f4..74d8907fc3539a3f4c73dd3b549d6de13e667e4b 100644
--- a/apps/files_versions/l10n/es_AR.php
+++ b/apps/files_versions/l10n/es_AR.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas las versiones",
 "History" => "Historia",
-"Versions" => "Versiones",
-"This will delete all existing backup versions of your files" => "Hacer estom borrarÃ¡ todas las versiones guardadas como copia de seguridad de tus archivos",
 "Files Versioning" => "Versionado de archivos",
 "Enable" => "Activar"
 );
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index f1296f23fcd3a3cea22cf63504c2b6b3c4bc08fa..ff119d5374efa7fc9ab4deccbd6c1b391e4aa47c 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "KÃµikide versioonide aegumine",
 "History" => "Ajalugu",
-"Versions" => "Versioonid",
-"This will delete all existing backup versions of your files" => "See kustutab kÃµik sinu failidest tehtud varuversiooni",
 "Files Versioning" => "Failide versioonihaldus",
 "Enable" => "Luba"
 );
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index d84d901170766e0e0f439f77c02bbb80e810e3ca..c6b4cd7692dada9b554fc4a56d00edfca3cc9d8a 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Iraungi bertsio guztiak",
 "History" => "Historia",
-"Versions" => "Bertsioak",
-"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu",
 "Files Versioning" => "Fitxategien Bertsioak",
 "Enable" => "Gaitu"
 );
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index 3cec4c04bfe095a9ec28de6eae6b9cc8d1e81c92..bdce8e9fe5209dc563dac6532bd64f17acda02d0 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Vanhenna kaikki versiot",
 "History" => "Historia",
-"Versions" => "Versiot",
-"This will delete all existing backup versions of your files" => "TÃ¤mÃ¤ poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot",
 "Files Versioning" => "Tiedostojen versiointi",
 "Enable" => "KÃ¤ytÃ¤"
 );
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index e6dbc274456ae1dbf295a41f04fe3a9ab0a723c3..2d26b98860ac147ac64d03e4c8fea11f1c4ace58 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Supprimer les versions intermÃ©diaires",
 "History" => "Historique",
-"Versions" => "Versions",
-"This will delete all existing backup versions of your files" => "Cette opÃ©ration va effacer toutes les versions intermÃ©diaires de vos fichiers (et ne garder que la derniÃ¨re version en date).",
 "Files Versioning" => "Versionnage des fichiers",
 "Enable" => "Activer"
 );
diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php
index f10c1e162639438a4026d11eb4c96048640ec348..7e44b8898bfa68e9f0d073922a5d824749f43ac4 100644
--- a/apps/files_versions/l10n/gl.php
+++ b/apps/files_versions/l10n/gl.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Caducan todas as versiÃ³ns",
 "History" => "Historial",
-"Versions" => "VersiÃ³ns",
-"This will delete all existing backup versions of your files" => "Isto eliminarÃ¡ todas as copias de seguranza que haxa dos seus ficheiros",
 "Files Versioning" => "Sistema de versiÃ³n de ficheiros",
 "Enable" => "Activar"
 );
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
index 061e88b0dbf54116f2f3e84136e594cbfaeeb21e..9eb4df64857fbd7675bc0814d65a286c39b96871 100644
--- a/apps/files_versions/l10n/he.php
+++ b/apps/files_versions/l10n/he.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "×”×¤×’×ª ×ª×•×§×£ ×›×œ ×”×’×¨×¡××•×ª",
 "History" => "×”×™×¡×˜×•×¨×™×”",
-"Versions" => "×’×¨×¡××•×ª",
-"This will delete all existing backup versions of your files" => "×¤×¢×•×œ×” ×–×• ×ª×ž×—×§ ××ª ×›×œ ×’×™×‘×•×™×™ ×”×’×¨×¡××•×ª ×”×§×™×™×ž×™× ×©×œ ×”×§×‘×¦×™× ×©×œ×š",
 "Files Versioning" => "×©×ž×™×¨×ª ×”×‘×“×œ×™ ×’×¨×¡××•×ª ×©×œ ×§×‘×¦×™×",
 "Enable" => "×”×¤×¢×œ×”"
 );
diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php
index 1575eda3f351e1a0b4fe9ddd120186f9a85cbf72..95d37ad06ed686b7b692b81802c5479785e91a5c 100644
--- a/apps/files_versions/l10n/hu_HU.php
+++ b/apps/files_versions/l10n/hu_HU.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Az Ã¶sszes korÃ¡bbi vÃ¡ltozat tÃ¶rlÃ©se",
 "History" => "KorÃ¡bbi vÃ¡ltozatok",
-"Versions" => "Az Ã¡llomÃ¡nyok korÃ¡bbi vÃ¡ltozatai",
-"This will delete all existing backup versions of your files" => "Itt tÃ¶rÃ¶lni tudja Ã¡llomÃ¡nyainak Ã¶sszes korÃ¡bbi verziÃ³jÃ¡t",
 "Files Versioning" => "Az Ã¡llomÃ¡nyok verzionÃ¡lÃ¡sa",
 "Enable" => "engedÃ©lyezve"
 );
diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php
index d8ac66c9763d9a69591d68b86bb7e229ad76cfc6..6c553327c42aca3414bdffb9850465b8737d405a 100644
--- a/apps/files_versions/l10n/id.php
+++ b/apps/files_versions/l10n/id.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "kadaluarsakan semua versi",
 "History" => "riwayat",
-"Versions" => "versi",
-"This will delete all existing backup versions of your files" => "ini akan menghapus semua versi backup yang ada dari file anda",
 "Files Versioning" => "pembuatan versi file",
 "Enable" => "aktifkan"
 );
diff --git a/apps/files_versions/l10n/is.php b/apps/files_versions/l10n/is.php
index f63939d3af92a2c89b608f50020f12d377a7fabf..ccb8287b71e9be068471d5db9332e2b5fd34ea66 100644
--- a/apps/files_versions/l10n/is.php
+++ b/apps/files_versions/l10n/is.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Ãšrelda allar ÃºtgÃ¡fur",
 "History" => "Saga",
-"Versions" => "ÃštgÃ¡fur",
-"This will delete all existing backup versions of your files" => "Ãžetta mun eyÃ°a Ã¶llum afritum af skrÃ¡num Ã¾Ãnum",
 "Files Versioning" => "ÃštgÃ¡fur af skrÃ¡m",
 "Enable" => "Virkja"
 );
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index 0b1e70823d5839db1425f878c3519097fa2787e6..c57b09301110bb6c825b9118ea1587f35cc95728 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Scadenza di tutte le versioni",
 "History" => "Cronologia",
-"Versions" => "Versioni",
-"This will delete all existing backup versions of your files" => "CiÃ² eliminerÃ  tutte le versioni esistenti dei tuoi file",
 "Files Versioning" => "Controllo di versione dei file",
 "Enable" => "Abilita"
 );
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index 367152c0743abadf07c04e27006e634499de161f..c97ba3d00ee81849ce81d15f60d062a44211d59a 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "ã™ã¹ã¦ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å‰Šé™¤ã™ã‚‹",
 "History" => "å±¥æ´",
-"Versions" => "ãƒãƒ¼ã‚¸ãƒ§ãƒ³",
-"This will delete all existing backup versions of your files" => "ã“ã‚Œã¯ã€ã‚ãªãŸã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã™ã¹ã¦ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å‰Šé™¤ã—ã¾ã™",
 "Files Versioning" => "ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†",
 "Enable" => "æœ‰åŠ¹åŒ–"
 );
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
index 688babb11219b334c88df4f7d5c969800baa99a5..f40925e1be2dc2d0a2b6d08dca26e0d40a144cb9 100644
--- a/apps/files_versions/l10n/ko.php
+++ b/apps/files_versions/l10n/ko.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "ëª¨ë“  ë²„ì „ ì‚ì œ",
 "History" => "ì—ì‚¬",
-"Versions" => "ë²„ì „",
-"This will delete all existing backup versions of your files" => "ì´ íŒŒì¼ì˜ ëª¨ë“  ë°±ì—… ë²„ì „ì„ ì‚ì œí•©ë‹ˆë‹¤",
 "Files Versioning" => "íŒŒì¼ ë²„ì „ ê´€ë¦¬",
 "Enable" => "ì‚¬ìš©í•¨"
 );
diff --git a/apps/files_versions/l10n/ku_IQ.php b/apps/files_versions/l10n/ku_IQ.php
index 5fa3b9080d7e91ec399eef0e70e59d2cc5672d8a..db5dbad49fcae65da0279cb0693592900767bca7 100644
--- a/apps/files_versions/l10n/ku_IQ.php
+++ b/apps/files_versions/l10n/ku_IQ.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "ÙˆÙ‡â€ŒØ´Ø§Ù†Ù‡â€ŒÚ©Ø§Ù† Ú¯Ø´ØªÛŒØ§Ù† Ø¨Ù‡â€ŒØ³Ù‡â€ŒØ±Ø¯Ù‡â€ŒÚ†Ù†",
 "History" => "Ù…ÛŽÚ˜ÙˆÙˆ",
-"Versions" => "ÙˆÙ‡â€ŒØ´Ø§Ù†",
-"This will delete all existing backup versions of your files" => "Ø¦Ù‡â€ŒÙ…Ù‡â€Œ Ø³Ù‡â€ŒØ±Ø¬Ù‡â€ŒÙ… Ù¾Ø§ÚµÙ¾Ø´ØªÛŒ ÙˆÙ‡â€ŒØ´Ø§Ù†Ù‡â€Œ Ù‡Ù‡â€ŒØ¨ÙˆÙˆÙ‡â€ŒÚ©Ø§Ù†ÛŒ Ù¾Ù‡â€ŒÚ•Ú¯Ù‡â€ŒÚ©Ø§Ù†Øª Ø¯Ù‡â€ŒØ³Ú•ÛŒÙ†ØªÙ‡â€ŒÙˆÙ‡",
 "Files Versioning" => "ÙˆÙ‡â€ŒØ´Ø§Ù†ÛŒ Ù¾Ù‡â€ŒÚ•Ú¯Ù‡",
 "Enable" => "Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†"
 );
diff --git a/apps/files_versions/l10n/lb.php b/apps/files_versions/l10n/lb.php
new file mode 100644
index 0000000000000000000000000000000000000000..3aa625ffc975fb488b552be22d9cb85b58a21fa4
--- /dev/null
+++ b/apps/files_versions/l10n/lb.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"History" => "Historique",
+"Files Versioning" => "Fichier's VersionÃ©ierung ",
+"Enable" => "Aschalten"
+);
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index 3250ddc7c3c51ca11cd11cb4bee29d851e694a58..adf4893020e583c923c1893373b8907f6487ac08 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Panaikinti visÅ³ versijÅ³ galiojimÄ…",
 "History" => "Istorija",
-"Versions" => "Versijos",
-"This will delete all existing backup versions of your files" => "Tai iÅ¡trins visas esamas failo versijas",
 "Files Versioning" => "FailÅ³ versijos",
 "Enable" => "Ä®jungti"
 );
diff --git a/apps/files_versions/l10n/mk.php b/apps/files_versions/l10n/mk.php
index 60a06ad3384fe4dbb11da73eec6a51a29c57b622..d3ec233fe4130e90f7a181a397a3ceac7e720951 100644
--- a/apps/files_versions/l10n/mk.php
+++ b/apps/files_versions/l10n/mk.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Ð˜ÑÑ‚ÐµÑ‡Ð¸ Ð³Ð¸ ÑÐ¸Ñ‚Ðµ Ð²ÐµÑ€Ð·Ð¸Ð¸",
 "History" => "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°",
-"Versions" => "Ð’ÐµÑ€ÑÐ¸Ð¸",
-"This will delete all existing backup versions of your files" => "ÐžÐ²Ð° ÑœÐµ Ð³Ð¸ Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐµ ÑÐ¸Ñ‚Ðµ Ð¿Ð¾ÑÑ‚Ð¾ÐµÑ‡ÐºÐ¸ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸ ÐºÐ¾Ð¿Ð¸Ð¸ Ð¾Ð´ Ð²Ð°ÑˆÐ¸Ñ‚Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸",
 "Files Versioning" => "Ð’ÐµÑ€Ð·Ð¸Ð¸ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸",
 "Enable" => "ÐžÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸"
 );
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index b441008db017f50cc106cdd0c997152a7a4fe1c2..18c725061027a0a0d216ca3850a5aaf50e71c1ff 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,7 +1,5 @@
 <?php $TRANSLATIONS = array(
 "History" => "Historie",
-"Versions" => "Versjoner",
-"This will delete all existing backup versions of your files" => "Dette vil slette alle tidligere versjoner av alle filene dine",
 "Files Versioning" => "Fil versjonering",
 "Enable" => "Aktiver"
 );
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
index f9b5507621d1bd4ee44a0dba21af78e6117d6af5..cd147ca693f0af302b7a479a9d643bb1c51ebf35 100644
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Alle versies laten verlopen",
 "History" => "Geschiedenis",
-"Versions" => "Versies",
-"This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen",
 "Files Versioning" => "Bestand versies",
 "Enable" => "Activeer"
 );
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
index 46c28d4590ab910ef720e388bbfc8411d8e75f1e..a0247b8abc62d5caa6a8279c347915901031ce8a 100644
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "WygasajÄ… wszystkie wersje",
 "History" => "Historia",
-"Versions" => "Wersje",
-"This will delete all existing backup versions of your files" => "Spowoduje to usuniÄ™cie wszystkich istniejÄ…cych wersji kopii zapasowych plikÃ³w",
 "Files Versioning" => "Wersjonowanie plikÃ³w",
 "Enable" => "WÅ‚Ä…cz"
 );
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
index 3d39a533d65f0a90bdce9606bdebc5e03a3a195f..854a30e6beeab87a003cddd422d0a5209a91a533 100644
--- a/apps/files_versions/l10n/pt_BR.php
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas as versÃµes",
 "History" => "HistÃ³rico",
-"Versions" => "VersÃµes",
-"This will delete all existing backup versions of your files" => "Isso removerÃ¡ todas as versÃµes de backup existentes dos seus arquivos",
 "Files Versioning" => "Versionamento de Arquivos",
 "Enable" => "Habilitar"
 );
diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php
index 2ddf70cc6c56e0f29165250792f0de988c799de2..dc1bde08cad0853c72c4eef5e9ec028dca68247f 100644
--- a/apps/files_versions/l10n/pt_PT.php
+++ b/apps/files_versions/l10n/pt_PT.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Expirar todas as versÃµes",
 "History" => "HistÃ³rico",
-"Versions" => "VersÃµes",
-"This will delete all existing backup versions of your files" => "Isto irÃ¡ apagar todas as versÃµes de backup do seus ficheiros",
 "Files Versioning" => "Versionamento de Ficheiros",
 "Enable" => "Activar"
 );
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index e23e771e3927867a17d988c4c670bb1c5c9a5a65..7dfaee3672b1c391f0968599560062f54ccc4cb0 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "ExpirÄƒ toate versiunile",
 "History" => "Istoric",
-"Versions" => "Versiuni",
-"This will delete all existing backup versions of your files" => "AceastÄƒ acÈ›iune va È™terge toate versiunile salvate ale fiÈ™ierelor tale",
 "Files Versioning" => "Versionare fiÈ™iere",
 "Enable" => "Activare"
 );
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index d698e90b8b86747138eef47239ed26e1517d8ff5..4c7fb5010912d39808cbc267d4a926f7efba29b3 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "ÐŸÑ€Ð¾ÑÑ€Ð¾Ñ‡Ð¸Ñ‚ÑŒ Ð²ÑÐµ Ð²ÐµÑ€ÑÐ¸Ð¸",
 "History" => "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ",
-"Versions" => "Ð’ÐµÑ€ÑÐ¸Ð¸",
-"This will delete all existing backup versions of your files" => "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð²ÐµÑ€ÑÐ¸Ð¹ Ð²Ð°ÑˆÐ¸Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð²",
 "Files Versioning" => "Ð’ÐµÑ€ÑÐ¸Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²",
 "Enable" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 );
diff --git a/apps/files_versions/l10n/ru_RU.php b/apps/files_versions/l10n/ru_RU.php
index 557c2f8e6d19bae1e6662ff176bd0189df9dfafd..8656e346eb6e51d36f165fc00afd310b2fb93e8d 100644
--- a/apps/files_versions/l10n/ru_RU.php
+++ b/apps/files_versions/l10n/ru_RU.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Ð¡Ñ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð²ÑÐµÑ… Ð²ÐµÑ€ÑÐ¸Ð¹ Ð¸ÑÑ‚ÐµÐºÐ°ÐµÑ‚",
 "History" => "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ",
-"Versions" => "Ð’ÐµÑ€ÑÐ¸Ð¸",
-"This will delete all existing backup versions of your files" => "ÐÑ‚Ð¾ Ð¿Ñ€Ð¸Ð²ÐµÐ´ÐµÑ‚ Ðº ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸ÑŽ Ð²ÑÐµÑ… ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ñ… Ð²ÐµÑ€ÑÐ¸Ð¹ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ Ð’Ð°ÑˆÐ¸Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð²",
 "Files Versioning" => "Ð¤Ð°Ð¹Ð»Ñ‹ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ€ÑÐ¸ÑÐ¼Ð¸",
 "Enable" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 );
diff --git a/apps/files_versions/l10n/si_LK.php b/apps/files_versions/l10n/si_LK.php
index dbddf6dc2e9db674d26697a05d24b04e9859cf1e..37debf869bc55f054c322f5993256f8f8e9c7ebf 100644
--- a/apps/files_versions/l10n/si_LK.php
+++ b/apps/files_versions/l10n/si_LK.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "à·ƒà·’à¶ºà¶½à·” à¶…à¶±à·”à·€à·à¶¯ à¶…à·€à¶½à¶‚à¶œà·” à¶šà¶»à¶±à·Šà¶±",
 "History" => "à¶‰à¶à·’à·„à·à·ƒà¶º",
-"Versions" => "à¶…à¶±à·”à·€à·à¶¯",
-"This will delete all existing backup versions of your files" => "à¶¸à·™à¶ºà·’à¶±à·Š à¶”à¶¶à¶œà·š à¶œà·œà¶±à·”à·€à·š à¶»à¶šà·Šà·à·’à¶ à¶šà¶»à¶±à·” à¶½à·à¶¶à·” à¶…à¶±à·”à·€à·à¶¯ à·ƒà·’à¶ºà¶½à·Šà¶½ à¶¸à¶šà· à¶¯à¶¸à¶±à·” à¶½à·à¶¶à·š",
 "Files Versioning" => "à¶œà·œà¶±à·” à¶…à¶±à·”à·€à·à¶¯à¶ºà¶±à·Š",
 "Enable" => "à·ƒà¶šà·Šâ€à¶»à·’à¶º à¶šà¶»à¶±à·Šà¶±"
 );
diff --git a/apps/files_versions/l10n/sk_SK.php b/apps/files_versions/l10n/sk_SK.php
index 132c6c09682b006252aed57d37a5ef2d4018df58..a3a3567cb4f99465180f82a8b5f4c2e47914b3e1 100644
--- a/apps/files_versions/l10n/sk_SK.php
+++ b/apps/files_versions/l10n/sk_SK.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "ExpirovaÅ¥ vÅ¡etky verzie",
 "History" => "HistÃ³ria",
-"Versions" => "Verzie",
-"This will delete all existing backup versions of your files" => "BudÃº zmazanÃ© vÅ¡etky zÃ¡lohovanÃ© verzie vaÅ¡ich sÃºborov",
 "Files Versioning" => "VytvÃ¡ranie verziÃ sÃºborov",
 "Enable" => "ZapnÃºÅ¥"
 );
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index 22b890a042dfdda891711e0c104da3088032e5b6..7f386c9edaa2d8a6d49755c776f34f414e73185f 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Zastaraj vse razliÄice",
 "History" => "Zgodovina",
-"Versions" => "RazliÄice",
-"This will delete all existing backup versions of your files" => "S tem bodo izbrisane vse obstojeÄe razliÄice varnostnih kopij vaÅ¡ih datotek",
 "Files Versioning" => "Sledenje razliÄicam",
 "Enable" => "OmogoÄi"
 );
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index e36164e30ab060cd557b03e2e4b40f848f87865c..6788d1fb0f969a942cb01fd191de89f91924843b 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "UpphÃ¶r alla versioner",
 "History" => "Historik",
-"Versions" => "Versioner",
-"This will delete all existing backup versions of your files" => "Detta kommer att radera alla befintliga sÃ¤kerhetskopior av dina filer",
 "Files Versioning" => "Versionshantering av filer",
 "Enable" => "Aktivera"
 );
diff --git a/apps/files_versions/l10n/ta_LK.php b/apps/files_versions/l10n/ta_LK.php
index f1215b3ecc1097ee8b9c4396127f7eaa51bc501d..aca76dcc2621697e3f515abcbbc9229da15a6511 100644
--- a/apps/files_versions/l10n/ta_LK.php
+++ b/apps/files_versions/l10n/ta_LK.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "à®Žà®²à¯à®²à®¾ à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯à®®à¯ à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à®¿à®µà®¿à®Ÿà¯à®Ÿà®¤à¯",
 "History" => "à®µà®°à®²à®¾à®±à¯",
-"Versions" => "à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯",
-"This will delete all existing backup versions of your files" => "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à¯‹à®ªà¯à®ªà¯à®•à¯à®•à®³à®¿à®²à¯ à®à®±à¯à®•à®©à®µà¯‡ à®‰à®³à¯à®³ à®†à®¤à®¾à®°à®¨à®•à®²à¯à®•à®³à®¿à®©à¯ à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à¯à®•à®³à¯ˆ à®‡à®µà¯ˆ à®…à®´à®¿à®¤à¯à®¤à¯à®µà®¿à®Ÿà¯à®®à¯",
 "Files Versioning" => "à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯",
 "Enable" => "à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
 );
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index 89b9f6269112692ff01ac7d1f9e54077b5f8d06b..e1e996903aea02efcef879b9c7c8525ae842928c 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¸—à¸¸à¸à¸£à¸¸à¹ˆà¸™",
 "History" => "à¸›à¸£à¸°à¸§à¸±à¸•à¸´",
-"Versions" => "à¸£à¸¸à¹ˆà¸™",
-"This will delete all existing backup versions of your files" => "à¸™à¸µà¹ˆà¸ˆà¸°à¹€à¸›à¹‡à¸™à¸¥à¸šà¸—à¸´à¹‰à¸‡à¹„à¸Ÿà¸¥à¹Œà¸£à¸¸à¹ˆà¸™à¸—à¸µà¹ˆà¸—à¸³à¸à¸²à¸£à¸ªà¸³à¸£à¸à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸—à¸µà¹ˆà¸¡à¸µà¸à¸¢à¸¹à¹ˆà¸‚à¸à¸‡à¸„à¸¸à¸“à¸—à¸´à¹‰à¸‡à¹„à¸›",
 "Files Versioning" => "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¹€à¸§à¸à¸£à¹Œà¸Šà¸±à¹ˆà¸™à¸‚à¸à¸‡à¹„à¸Ÿà¸¥à¹Œ",
 "Enable" => "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 );
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
index 73f207d5024f14b0209d0886b6d00be6dd7712e5..e9a4c4702e13b2d635ef060cf5469d57b0d958c4 100644
--- a/apps/files_versions/l10n/tr.php
+++ b/apps/files_versions/l10n/tr.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "TÃ¼m sÃ¼rÃ¼mleri sona erdir",
 "History" => "GeÃ§miÅŸ",
-"Versions" => "SÃ¼rÃ¼mler",
-"This will delete all existing backup versions of your files" => "Bu dosyalarÄ±nÄ±zÄ±n tÃ¼m yedek sÃ¼rÃ¼mlerini silecektir",
 "Files Versioning" => "Dosya SÃ¼rÃ¼mleri",
 "Enable" => "EtkinleÅŸtir"
 );
diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php
index 7532f755c881699e84ff11f275965e69df458d10..49acda810792942ad0243edac376e8e921195ea2 100644
--- a/apps/files_versions/l10n/uk.php
+++ b/apps/files_versions/l10n/uk.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Ð¢ÐµÑ€Ð¼Ñ–Ð½ Ð´Ñ–Ñ— Ð²ÑÑ–Ñ… Ð²ÐµÑ€ÑÑ–Ð¹",
 "History" => "Ð†ÑÑ‚Ð¾Ñ€Ñ–Ñ",
-"Versions" => "Ð’ÐµÑ€ÑÑ–Ñ—",
-"This will delete all existing backup versions of your files" => "Ð¦Ðµ Ð¿Ñ€Ð¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð·Ð½Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð²ÑÑ–Ñ… Ñ–ÑÐ½ÑƒÑŽÑ‡Ð¸Ñ… Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¸Ñ… Ð²ÐµÑ€ÑÑ–Ð¹ Ð’Ð°ÑˆÐ¸Ñ… Ñ„Ð°Ð¹Ð»Ñ–Ð²",
 "Files Versioning" => "Ð’ÐµÑ€ÑÑ–Ñ— Ñ„Ð°Ð¹Ð»Ñ–Ð²",
 "Enable" => "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸"
 );
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
index 260c3b6b39c7575432a83f97ad4c51c9561fc8bc..bb7163f6b1875bcafeb1f6f6f6b28502ee9adb52 100644
--- a/apps/files_versions/l10n/vi.php
+++ b/apps/files_versions/l10n/vi.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Háº¿t háº¡n táº¥t cáº£ cÃ¡c phiÃªn báº£n",
 "History" => "Lá»‹ch sá»",
-"Versions" => "PhiÃªn báº£n",
-"This will delete all existing backup versions of your files" => "Khi báº¡n thá»±c hiá»‡n thao tÃ¡c nÃ y sáº½ xÃ³a táº¥t cáº£ cÃ¡c phiÃªn báº£n sao lÆ°u hiá»‡n cÃ³ ",
 "Files Versioning" => "PhiÃªn báº£n táºp tin",
 "Enable" => "Báºt "
 );
diff --git a/apps/files_versions/l10n/zh_CN.GB2312.php b/apps/files_versions/l10n/zh_CN.GB2312.php
index 107805221b85beaa53027f1e0fd2da322c66321d..d9e788033aaab1f995650b04f86b8db67de4f29b 100644
--- a/apps/files_versions/l10n/zh_CN.GB2312.php
+++ b/apps/files_versions/l10n/zh_CN.GB2312.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "ä½œåºŸæ‰€æœ‰ç‰ˆæœ¬",
 "History" => "åŽ†å²",
-"Versions" => "ç‰ˆæœ¬",
-"This will delete all existing backup versions of your files" => "è¿™å°†åˆ é™¤æ‰€æœ‰æ‚¨çŽ°æœ‰æ–‡ä»¶çš„å¤‡ä»½ç‰ˆæœ¬",
 "Files Versioning" => "æ–‡ä»¶ç‰ˆæœ¬",
 "Enable" => "å¯ç”¨"
 );
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
index 48e7157c98ffdb57425e929686292456592c4004..14301ff0c04a39f35edfe677115e8394fac33c49 100644
--- a/apps/files_versions/l10n/zh_CN.php
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -1,8 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "è¿‡æœŸæ‰€æœ‰ç‰ˆæœ¬",
 "History" => "åŽ†å²",
-"Versions" => "ç‰ˆæœ¬",
-"This will delete all existing backup versions of your files" => "å°†ä¼šåˆ é™¤æ‚¨çš„æ–‡ä»¶çš„æ‰€æœ‰å¤‡ä»½ç‰ˆæœ¬",
 "Files Versioning" => "æ–‡ä»¶ç‰ˆæœ¬",
 "Enable" => "å¼€å¯"
 );
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
index a21fdc85f8d969ae80c40dc923a2d44a7228e4f6..a7b496b37dbcdf613fe379e41cac880a060cc602 100644
--- a/apps/files_versions/l10n/zh_TW.php
+++ b/apps/files_versions/l10n/zh_TW.php
@@ -1,7 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "æ‰€æœ‰é€¾æœŸçš„ç‰ˆæœ¬",
 "History" => "æ·å²",
-"Versions" => "ç‰ˆæœ¬",
 "Files Versioning" => "æª”æ¡ˆç‰ˆæœ¬åŒ–ä¸...",
 "Enable" => "å•Ÿç”¨"
 );
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index f938a2dbe842331b2ba402973af3d7f60c2e833f..48be5e223ac0eef2b3c6b0973b97274a4bd31245 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -79,6 +79,7 @@ class Storage {
 
 			// create all parent folders
 			$info=pathinfo($filename);
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').$users_view->getAbsolutePath('files_versions/');
 			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) {
 				mkdir($versionsFolderName.'/'.$info['dirname'], 0750, true);
 			}
@@ -127,7 +128,8 @@ class Storage {
 		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');
+		$files_view = new \OC_FilesystemView('/'.$uid .'/files');
+		$abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_view->getAbsolutePath('').$newpath;
 		
 		if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
 			$versions_view->rename($oldpath, $newpath);
@@ -149,7 +151,8 @@ class Storage {
 		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 			list($uid, $filename) = self::getUidAndFilename($filename);
 			$users_view = new \OC_FilesystemView('/'.$uid);
-
+			$versionCreated = false;
+			
 			//first create a new version
 			$version = 'files_versions'.$filename.'.v'.$users_view->filemtime('files'.$filename);
 			if ( !$users_view->file_exists($version)) {
diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
index 88063cb075ba246f7e2e5d99de22fb23ba3e2c11..bfca8366f5da50d78ce670fdcf9d088f35ca306f 100644
--- a/apps/files_versions/templates/settings.php
+++ b/apps/files_versions/templates/settings.php
@@ -1,6 +1,6 @@
 <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>
+	<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/css/settings.css b/apps/user_ldap/css/settings.css
index f3f41fb2d8bea101c1b5b29acf8464938ad90f36..84ada0832ab52f5ac263a65aaf93dde25e22fa71 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -2,9 +2,11 @@
 	width: 20%;
 	max-width: 200px;
 	display: inline-block;
+	vertical-align: top;
+	padding-top: 9px;
 }
 
-#ldap fieldset input {
+#ldap fieldset input, #ldap fieldset textarea {
 	width: 70%;
 	display: inline-block;
 }
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index ced0b4293b71f145c1b02d1d3bf3f171d77b31fd..da1710a0a3c6a33a090abc241c35bf4c1d7ef2b2 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Password" => "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±"
+"Password" => "ÙƒÙ„Ù…Ø© Ø§Ù„Ù…Ø±ÙˆØ±",
+"Help" => "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©"
 );
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index d801ddff63196363c32a9481a885ad2f8111f761..06255c1249a511f7fd442e647565377d894e6a06 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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>AvÃs:</b> Les aplicacions user_ldap i user_webdavauth sÃ³n incompatibles. Podeu experimentar comportaments no desitjats. Demaneu a l'administrador del sistema que en desactivi una.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>AvÃs:</b> El mÃ²dul  PHP LDAP necessari no estÃ  instalÂ·lat, el dorsal no funcionarÃ . Demaneu a l'administrador del sistema que l'instalÂ·li.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>AvÃs:</b> El mÃ²dul PHP LDAP no estÃ  instalÂ·lat, el dorsal no funcionarÃ . Demaneu a l'administrador del sistema que l'instalÂ·li.",
 "Host" => "MÃ quina",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
 "Base DN" => "DN Base",
+"One Base DN per line" => "Una DN Base per lÃnia",
 "You can specify Base DN for users and groups in the Advanced tab" => "Podeu especificar DN Base per usuaris i grups a la pestanya AvanÃ§at",
 "User DN" => "DN Usuari",
 "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." => "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.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sense cap parÃ metre de substituciÃ³, per exemple \"objectClass=grupPosix\".",
 "Port" => "Port",
 "Base User Tree" => "Arbre base d'usuaris",
+"One User Base DN per line" => "Una DN Base d'Usuari per lÃnia",
 "Base Group Tree" => "Arbre base de grups",
+"One Group Base DN per line" => "Una DN Base de Grup per lÃnia",
 "Group-Member association" => "AssociaciÃ³ membres-grup",
 "Use TLS" => "Usa TLS",
 "Do not use it for SSL connections, it will fail." => "No ho useu en connexions SSL, fallarÃ .",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 0c14ebb9d1ee660eefa51b89392cf61af89ae3d2..80e27f1e62a5673012ec7f6364498f334991e362 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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>VarovÃ¡nÃ:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibilnÃ. MÅ¯Å¾e nastÃ¡vat neoÄekÃ¡vanÃ© chovÃ¡nÃ. PoÅ¾Ã¡dejte, prosÃm, sprÃ¡vce systÃ©mu aby jednu z nich zakÃ¡zal.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡n LDAP modul pro PHP, podpÅ¯rnÃ¡ vrstva nebude fungovat. PoÅ¾Ã¡dejte, prosÃm, sprÃ¡vce systÃ©mu aby jej nainstaloval.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡n LDAP modul pro PHP, podpÅ¯rnÃ¡ vrstva nebude fungovat. PoÅ¾Ã¡dejte, prosÃm, sprÃ¡vce systÃ©mu aby jej nainstaloval.",
 "Host" => "PoÄÃtaÄ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "MÅ¯Å¾ete vynechat protokol, vyjma pokud poÅ¾adujete SSL. Tehdy zaÄnÄ›te s ldaps://",
 "Base DN" => "ZÃ¡kladnÃ DN",
+"One Base DN per line" => "Jedna zÃ¡kladnÃ DN na Å™Ã¡dku",
 "You can specify Base DN for users and groups in the Advanced tab" => "V rozÅ¡ÃÅ™enÃ©m nastavenÃ mÅ¯Å¾ete urÄit zÃ¡kladnÃ DN pro uÅ¾ivatele a skupiny",
 "User DN" => "UÅ¾ivatelskÃ© 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 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Ã©.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez zÃ¡stupnÃ½ch znakÅ¯, napÅ™. \"objectClass=posixGroup\".",
 "Port" => "Port",
 "Base User Tree" => "ZÃ¡kladnÃ uÅ¾ivatelskÃ½ strom",
+"One User Base DN per line" => "Jedna uÅ¾ivatelskÃ¡ zÃ¡kladnÃ DN na Å™Ã¡dku",
 "Base Group Tree" => "ZÃ¡kladnÃ skupinovÃ½ strom",
+"One Group Base DN per line" => "Jedna skupinovÃ¡ zÃ¡kladnÃ DN na Å™Ã¡dku",
 "Group-Member association" => "Asociace Älena skupiny",
 "Use TLS" => "PouÅ¾Ãt TLS",
 "Do not use it for SSL connections, it will fail." => "NepouÅ¾Ãvejte pro pÅ™ipojenÃ pomocÃ SSL, pÅ™ipojenÃ selÅ¾e.",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 87579cb243108f7543a286d69079e19dfd73c4d6..efc8a80f8c70134dfc2a933a2eada7463b08669c 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benÃ¶ntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen 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 ist nicht installiert, das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, auÃŸer wenn Du SSL benÃ¶tigst. Beginne dann mit ldaps://",
 "Base DN" => "Basis-DN",
+"One Base DN per line" => "Ein Base DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Du kannst Basis-DN fÃ¼r Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
 "User DN" => "Benutzer-DN",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Der DN des Benutzers fÃ¼r LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. FÃ¼r anonymen Zugriff lasse DN und Passwort leer.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
 "Port" => "Port",
 "Base User Tree" => "Basis-Benutzerbaum",
+"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
 "Base Group Tree" => "Basis-Gruppenbaum",
+"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
 "Use TLS" => "Nutze TLS",
 "Do not use it for SSL connections, it will fail." => "Verwende dies nicht fÃ¼r SSL-Verbindungen, es wird fehlschlagen.",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index f986ae83e8732d27f52f6a28a9a3538198856fc7..843609f8b89ededa37cee7889f6a777becd0e38e 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warnung:</b> Das PHP-Modul, das LDAP benÃ¶ntigt, ist nicht installiert. Das Backend wird 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 ist nicht installiert, das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie kÃ¶nnen das Protokoll auslassen, auÃŸer wenn Sie SSL benÃ¶tigen. Beginnen Sie dann mit ldaps://",
 "Base DN" => "Basis-DN",
+"One Base DN per line" => "Ein Base DN pro Zeile",
 "You can specify Base DN for users and groups in the Advanced tab" => "Sie kÃ¶nnen Basis-DN fÃ¼r Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
 "User DN" => "Benutzer-DN",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Der DN des Benutzers fÃ¼r LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. FÃ¼r anonymen Zugriff lassen Sie DN und Passwort leer.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ohne Platzhalter, z.B.: \"objectClass=posixGroup\"",
 "Port" => "Port",
 "Base User Tree" => "Basis-Benutzerbaum",
+"One User Base DN per line" => "Ein Benutzer Base DN pro Zeile",
 "Base Group Tree" => "Basis-Gruppenbaum",
+"One Group Base DN per line" => "Ein Gruppen Base DN pro Zeile",
 "Group-Member association" => "Assoziation zwischen Gruppe und Benutzer",
 "Use TLS" => "Nutze TLS",
 "Do not use it for SSL connections, it will fail." => "Verwenden Sie dies nicht fÃ¼r SSL-Verbindungen, es wird fehlschlagen.",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 8c421cf162ba622f040ce68edf865f0eb8186536..1f75a687a5d60691a11bc0f9f731cb81f97d3974 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> Î¤Î¿ PHP LDAP module Ï€Î¿Ï… Î±Ï€Î±Î¹Ï„ÎµÎ¯Ï„Î±Î¹ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿ ÎºÎ±Î¹ Î¿ Î¼Î·Ï‡Î±Î½Î¹ÏƒÎ¼ÏŒÏ‚ Î´ÎµÎ½ Î¸Î± Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î®ÏƒÎµÎ¹. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Î¶Î·Ï„Î®ÏƒÏ„Îµ Î±Ï€ÏŒ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® Ï„Î¿Ï… ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î½Î± Ï„Î¿ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÎ¹.",
 "Host" => "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Ï€Î±ÏÎ±Î»ÎµÎ¯ÏˆÎµÏ„Îµ Ï„Î¿ Ï€ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿, ÎµÎºÏ„ÏŒÏ‚ Î±Î½ Î±Ï€Î±Î¹Ï„ÎµÎ¯Ï„Î±Î¹ SSL. Î£Îµ Î±Ï…Ï„Î® Ï„Î·Î½ Ï€ÎµÏÎ¯Ï€Ï„Ï‰ÏƒÎ· Î¾ÎµÎºÎ¹Î½Î®ÏƒÏ„Îµ Î¼Îµ ldaps://",
 "Base DN" => "Base DN",
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index ef8aff8a39092171a12e83ab913b37e339ca2438..35f436a0b0aef01b7761e5a1aa25d6b9376391cc 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Host" => "Gastigo",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
-"Base DN" => "Baz-DN",
+"Base DN" => "Bazo-DN",
 "User DN" => "Uzanto-DN",
 "Password" => "Pasvorto",
 "For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 4931af79eaf360ced70aeab20fd2e2c3fd9780d8..48e7b24734ecce5560a5b3b0e43fd5db36d82c6f 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El mÃ³dulo PHP LDAP necesario no estÃ¡ instalado, el sistema no funcionarÃ¡. Pregunte al administrador del sistema para instalarlo.",
 "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",
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
index 0b1340d4397902151a0f123edb06e4335c163487..331bf8699f48d1aedb32e4e3bf596bd03bc4c7e1 100644
--- a/apps/user_ldap/l10n/es_AR.php
+++ b/apps/user_ldap/l10n/es_AR.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibles.  Puede que experimente un comportamiento inesperado. Pregunte al administrador del sistema para desactivar uno de ellos.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El mÃ³dulo PHP LDAP necesario no estÃ¡ instalado, el sistema no funcionarÃ¡. Pregunte al administrador del sistema para instalarlo.",
 "Host" => "Servidor",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "PodÃ©s omitir el protocolo, excepto si SSL es requerido. En ese caso, empezÃ¡ con ldaps://",
 "Base DN" => "DN base",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 06ca9cb294e40f401703edf81180fd33b59e386c..e2b50f28ee9d6464c3106f1f1db34ded0f14dfe9 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
 "Host" => "Hostalaria",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
 "Base DN" => "Oinarrizko DN",
+"One Base DN per line" => "DN Oinarri bat lerroko",
 "You can specify Base DN for users and groups in the Advanced tab" => "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
 "User DN" => "Erabiltzaile 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." => "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "txantiloirik gabe, adb. \"objectClass=posixGroup\".",
 "Port" => "Portua",
 "Base User Tree" => "Oinarrizko Erabiltzaile Zuhaitza",
+"One User Base DN per line" => "Erabiltzaile DN Oinarri bat lerroko",
 "Base Group Tree" => "Oinarrizko Talde Zuhaitza",
+"One Group Base DN per line" => "Talde DN Oinarri bat lerroko",
 "Group-Member association" => "Talde-Kide elkarketak",
 "Use TLS" => "Erabili TLS",
 "Do not use it for SSL connections, it will fail." => "Ez erabili SSL konexioetan, huts egingo du.",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 9750d1352a8ea6698a2cb8ca1267bd5c9be2d707..28ee6346ef4a405372924b58dde8eaf12328c7c3 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,12 +1,13 @@
 <?php $TRANSLATIONS = array(
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont incompatibles. Des disfonctionnements peuvent survenir. Contactez votre administrateur systÃ¨me pour qu'il dÃ©sactive l'une d'elles.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installÃ©, l'application ne marchera pas. Contactez votre administrateur systÃ¨me pour qu'il l'installe.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Attention :</b> Le module php LDAP n'est pas installÃ©, par consÃ©quent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur systÃ¨me afin qu'il l'installe.",
 "Host" => "HÃ´te",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas prÃ©fixez avec ldaps://",
 "Base DN" => "DN Racine",
-"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez dÃ©tailler les DN Racines de vos utilisateurs et groupes dans l'onglet AvancÃ©",
+"One Base DN per line" => "Un DN racine par ligne",
+"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spÃ©cifier les DN Racines de vos utilisateurs et groupes via l'onglet AvancÃ©",
 "User DN" => "DN Utilisateur (AutorisÃ© Ã  consulter l'annuaire)",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accÃ¨s anonyme, laisser le DN et le mot de passe vides.",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN de l'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accÃ¨s anonyme, laisser le DN et le mot de passe vides.",
 "Password" => "Mot de passe",
 "For anonymous access, leave DN and Password empty." => "Pour un accÃ¨s anonyme, laisser le DN Utilisateur et le mot de passe vides.",
 "User Login Filter" => "ModÃ¨le d'authentification utilisateurs",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "sans Ã©lÃ©ment de substitution, par exemple \"objectClass=posixGroup\".",
 "Port" => "Port",
 "Base User Tree" => "DN racine de l'arbre utilisateurs",
+"One User Base DN per line" => "Un DN racine utilisateur par ligne",
 "Base Group Tree" => "DN racine de l'arbre groupes",
+"One Group Base DN per line" => "Un DN racine groupe par ligne",
 "Group-Member association" => "Association groupe-membre",
 "Use TLS" => "Utiliser TLS",
 "Do not use it for SSL connections, it will fail." => "Ne pas utiliser pour les connexions SSL, car cela Ã©chouera.",
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
index ae05efcd27f9d7581f242cd2f9fb170836273916..d60521c4a02ee77367189836bb1c005fcbc3eea4 100644
--- a/apps/user_ldap/l10n/gl.php
+++ b/apps/user_ldap/l10n/gl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O mÃ³dulo PHP LDAP Ã© necesario e non estÃ¡ instalado, a infraestrutura non funcionarÃ¡. Consulte co administrador do sistema para instalalo.",
 "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",
diff --git a/apps/user_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
new file mode 100644
index 0000000000000000000000000000000000000000..91503315066c42bb31391ed0f1ea03a8c3fb95b3
--- /dev/null
+++ b/apps/user_ldap/l10n/hr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "PomoÄ‡"
+);
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index 577afcef1c90da477cd56aa348e19db07bdb6d73..25ee47786efb103bb3bad79556088fb6915c5ac6 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -1,11 +1,13 @@
 <?php $TRANSLATIONS = array(
 "<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>Figyelem:</b> a user_ldap Ã©s user_webdavauth alkalmazÃ¡sok nem kompatibilisek. EgyÃ¼ttes hasznÃ¡latuk vÃ¡ratlan eredmÃ©nyekhez vezethet. KÃ©rje meg a rendszergazdÃ¡t, hogy a kettÅ‘ kÃ¶zÃ¼l kapcsolja ki az egyiket.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Figyelem:</b> a szÃ¼ksÃ©ges PHP LDAP modul nincs telepÃtve. EnÃ©lkÃ¼l az LDAP azonosÃtÃ¡s nem fog mÅ±kÃ¶dni. KÃ©rje meg a rendszergazdÃ¡t, hogy telepÃtse a szÃ¼ksÃ©ges modult!",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>FigyelmeztetÃ©s:</b> Az LDAP PHP modul nincs telepÃtve, ezÃ©rt ez az alrendszer nem fog mÅ±kÃ¶dni. KÃ©rje meg a rendszergazdÃ¡t, hogy telepÃtse!",
 "Host" => "KiszolgÃ¡lÃ³",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "A protokoll elÅ‘tag elhagyhatÃ³, kivÃ©ve, ha SSL-t kÃvÃ¡n hasznÃ¡lni. Ebben az esetben kezdje Ãgy:  ldaps://",
 "Base DN" => "DN-gyÃ¶kÃ©r",
+"One Base DN per line" => "SoronkÃ©nt egy DN-gyÃ¶kÃ©r",
 "You can specify Base DN for users and groups in the Advanced tab" => "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",
 "User DN" => "A kapcsolÃ³dÃ³ felhasznÃ¡lÃ³ DN-je",
+"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." => "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!",
 "Password" => "JelszÃ³",
 "For anonymous access, leave DN and Password empty." => "BejelentkezÃ©s nÃ©lkÃ¼li elÃ©rÃ©shez ne tÃ¶ltse ki a DN Ã©s JelszÃ³ mezÅ‘ket!",
 "User Login Filter" => "SzÅ±rÅ‘ a bejelentkezÃ©shez",
@@ -19,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "itt ne hasznÃ¡ljunk vÃ¡ltozÃ³t, pl. \"objectClass=posixGroup\".",
 "Port" => "Port",
 "Base User Tree" => "A felhasznÃ¡lÃ³i fa gyÃ¶kere",
+"One User Base DN per line" => "SoronkÃ©nt egy felhasznÃ¡lÃ³i fa gyÃ¶kerÃ©t adhatjuk meg",
 "Base Group Tree" => "A csoportfa gyÃ¶kere",
+"One Group Base DN per line" => "SoronkÃ©nt egy csoportfa gyÃ¶kerÃ©t adhatjuk meg",
 "Group-Member association" => "A csoporttagsÃ¡g attribÃºtuma",
 "Use TLS" => "HasznÃ¡ljunk TLS-t",
 "Do not use it for SSL connections, it will fail." => "Ne hasznÃ¡ljuk SSL-kapcsolat esetÃ©n, mert nem fog mÅ±kÃ¶dni!",
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
new file mode 100644
index 0000000000000000000000000000000000000000..3586bf5a2e74cb7ea0cec1f9979b5ca872777621
--- /dev/null
+++ b/apps/user_ldap/l10n/ia.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Adjuta"
+);
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index 915ce3af5b8894228ec3e5e0a6178150c4229639..bee30cfe6ec50f4a5cffcca25d35736eccfb5243 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne uno.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP richiesto non Ã¨ installato, il motore non funzionerÃ . Chiedi al tuo amministratore di sistema di installarlo.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avviso:</b> il modulo PHP LDAP non Ã¨ installato, il motore non funzionerÃ . Chiedi al tuo amministratore di sistema di installarlo.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Ãˆ possibile omettere il protocollo, ad eccezione se Ã¨ necessario SSL. Quindi inizia con ldaps://",
 "Base DN" => "DN base",
+"One Base DN per line" => "Un DN base per riga",
 "You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
 "User DN" => "DN utente",
 "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." => "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",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "senza nessun segnaposto, per esempio \"objectClass=posixGroup\".",
 "Port" => "Porta",
 "Base User Tree" => "Struttura base dell'utente",
+"One User Base DN per line" => "Un DN base utente per riga",
 "Base Group Tree" => "Struttura base del gruppo",
+"One Group Base DN per line" => "Un DN base gruppo per riga",
 "Group-Member association" => "Associazione gruppo-utente ",
 "Use TLS" => "Usa TLS",
 "Do not use it for SSL connections, it will fail." => "Non utilizzare per le connessioni SSL, fallirÃ .",
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index c7b2a0f91b8ed5886b9a804be61ce33177001571..1c93db7ba09539a9a1d07cb410de0adb2cf74604 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>è¦å‘Š:</b> PHP LDAP ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒæ£ã—ãã©ã†ã•ã—ã¾ã›ã‚“ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>è¦å‘Š:</b> PHP LDAP ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒæ£ã—ãå‹•ä½œã—ã¾ã›ã‚“ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚",
 "Host" => "ãƒ›ã‚¹ãƒˆ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSLé€šä¿¡ã—ãªã„å ´åˆã«ã¯ã€ãƒ—ãƒãƒˆã‚³ãƒ«åã‚’çœç•¥ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãã†ã§ãªã„å ´åˆã«ã¯ã€ldaps:// ã‹ã‚‰å§‹ã‚ã¦ãã ã•ã„ã€‚",
 "Base DN" => "ãƒ™ãƒ¼ã‚¹DN",
+"One Base DN per line" => "1è¡Œã«1ã¤ã®ãƒ™ãƒ¼ã‚¹DN",
 "You can specify Base DN for users and groups in the Advanced tab" => "æ‹¡å¼µã‚¿ãƒ–ã§ãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ™ãƒ¼ã‚¹DNã‚’æŒ‡å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚",
 "User DN" => "ãƒ¦ãƒ¼ã‚¶DN",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆãƒ¦ãƒ¼ã‚¶ãƒ¼ã®DNã¯ã€ç‰¹å®šã®ã‚‚ã®ã«çµã³ã¤ã‘ã‚‹ã“ã¨ã¯ã—ã¾ã›ã‚“ã€‚ ä¾‹ãˆã° uid=agent,dc=example,dc=com. ã ã¨åŒ¿åã‚¢ã‚¯ã‚»ã‚¹ã®å ´åˆã€DNã¨ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã¯ç©ºã®ã¾ã¾ã§ã™ã€‚",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "ãƒ—ãƒ¬ãƒ¼ã‚¹ãƒ›ãƒ«ãƒ€ãƒ¼ã‚’åˆ©ç”¨ã—ãªã„ã§ãã ã•ã„ã€‚ä¾‹ \"objectClass=posixGroup\"",
 "Port" => "ãƒãƒ¼ãƒˆ",
 "Base User Tree" => "ãƒ™ãƒ¼ã‚¹ãƒ¦ãƒ¼ã‚¶ãƒ„ãƒªãƒ¼",
+"One User Base DN per line" => "1è¡Œã«1ã¤ã®ãƒ¦ãƒ¼ã‚¶ãƒ™ãƒ¼ã‚¹DN",
 "Base Group Tree" => "ãƒ™ãƒ¼ã‚¹ã‚°ãƒ«ãƒ¼ãƒ—ãƒ„ãƒªãƒ¼",
+"One Group Base DN per line" => "1è¡Œã«1ã¤ã®ã‚°ãƒ«ãƒ¼ãƒ—ãƒ™ãƒ¼ã‚¹DN",
 "Group-Member association" => "ã‚°ãƒ«ãƒ¼ãƒ—ã¨ãƒ¡ãƒ³ãƒãƒ¼ã®é–¢é€£ä»˜ã‘",
 "Use TLS" => "TLSã‚’åˆ©ç”¨",
 "Do not use it for SSL connections, it will fail." => "SSLæŽ¥ç¶šã«åˆ©ç”¨ã—ãªã„ã§ãã ã•ã„ã€å¤±æ•—ã—ã¾ã™ã€‚",
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
new file mode 100644
index 0000000000000000000000000000000000000000..630d92b73ad0c4fbe2b7c2e058fefda3d14253da
--- /dev/null
+++ b/apps/user_ldap/l10n/ka_GE.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ"
+);
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 37ac3d1bda586994832fb6514b32f8675563617e..c0d09b5c3c1fbdc04be923738125faf9780a144e 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>ê²½ê³ </b>PHP LDAP ëª¨ë“ˆì´ ì„¤ì¹˜ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. ë°±ì—”ë“œê°€ ë™ìž‘í•˜ì§€ ì•Šì„ ê²ƒ ìž…ë‹ˆë‹¤. ì‹œìŠ¤í…œê´€ë¦¬ìžì—ê²Œ ìš”ì²í•˜ì—¬ í•´ë‹¹ ëª¨ë“ˆì„ ì„¤ì¹˜í•˜ì‹œê¸° ë°”ëžë‹ˆë‹¤.",
 "Host" => "í˜¸ìŠ¤íŠ¸",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSLì„ ì‚¬ìš©í•˜ëŠ” ê²½ìš°ê°€ ì•„ë‹ˆë¼ë©´ í”„ë¡œí† ì½œì„ ìž…ë ¥í•˜ì§€ ì•Šì•„ë„ ë©ë‹ˆë‹¤. SSLì„ ì‚¬ìš©í•˜ë ¤ë©´ ldaps://ë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤.",
 "Base DN" => "ê¸°ë³¸ DN",
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
new file mode 100644
index 0000000000000000000000000000000000000000..1ae808ddd91007e3b322192016aed9d0c25781ea
--- /dev/null
+++ b/apps/user_ldap/l10n/ku_IQ.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "ÛŒØ§Ø±Ù…Û•ØªÛŒ"
+);
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
new file mode 100644
index 0000000000000000000000000000000000000000..6d70f682ddb93575f007ebc2076339a9ce61eaab
--- /dev/null
+++ b/apps/user_ldap/l10n/lb.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Passwuert",
+"Help" => "HÃ«llef"
+);
diff --git a/apps/user_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
new file mode 100644
index 0000000000000000000000000000000000000000..52353472e4d5bb0ce5a85663fe227181361e8d73
--- /dev/null
+++ b/apps/user_ldap/l10n/lv.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "PalÄ«dzÄ«ba"
+);
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
index 70a62e717656f5a41a68ae9c9833878e8f68e00f..4c231b516d47910b5c826f75bc48c58773640959 100644
--- a/apps/user_ldap/l10n/mk.php
+++ b/apps/user_ldap/l10n/mk.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Host" => "Ð”Ð¾Ð¼Ð°ÑœÐ¸Ð½",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "ÐœÐ¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ ÑÐºÐ¾ÐºÐ½ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ñ‚ÐºÐ¾Ð»Ð¾Ñ‚ Ð¾ÑÐ²ÐµÐ½ Ð°ÐºÐ¾ Ð½Ðµ Ð²Ð¸ Ñ‚Ñ€ÐµÐ±Ð° SSL. Ð¢Ð¾Ð³Ð°Ñˆ ÑÑ‚Ð°Ð²ÐµÑ‚Ðµ ldaps://",
-"Password" => "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
+"Password" => "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°",
+"Help" => "ÐŸÐ¾Ð¼Ð¾Ñˆ"
 );
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
new file mode 100644
index 0000000000000000000000000000000000000000..077a5390cf8b4f06bcedb471a2b99b2203c8e82c
--- /dev/null
+++ b/apps/user_ldap/l10n/ms_MY.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Bantuan"
+);
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 23e9a15c0104a758d2149a637ac23b8d4b2d8753..27c4407360ec000d453e30e6a3b7b0cb05353617 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -1,11 +1,12 @@
 <?php $TRANSLATIONS = array(
 "<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geÃ¯nstalleerd, de backend zal dus niet werken. Vraag uw beheerder de module te installeren.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geÃ¯nstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren.",
 "Host" => "Host",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
-"Base DN" => "Basis DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
-"User DN" => "Gebruikers DN",
+"Base DN" => "Base DN",
+"One Base DN per line" => "Een Base DN per regel",
+"You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
+"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." => "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.",
 "Password" => "Wachtwoord",
 "For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "zonder een placeholder, bijv. \"objectClass=posixGroup\"",
 "Port" => "Poort",
 "Base User Tree" => "Basis Gebruikers Structuur",
+"One User Base DN per line" => "Een User Base DN per regel",
 "Base Group Tree" => "Basis Groupen Structuur",
+"One Group Base DN per line" => "Een Group Base DN per regel",
 "Group-Member association" => "Groepslid associatie",
 "Use TLS" => "Gebruik TLS",
 "Do not use it for SSL connections, it will fail." => "Gebruik niet voor SSL connecties, deze mislukken.",
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..54d1f158f65f05cca5fb71c7d96c5ee838a9f6fe
--- /dev/null
+++ b/apps/user_ldap/l10n/nn_NO.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Hjelp"
+);
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
new file mode 100644
index 0000000000000000000000000000000000000000..0bf27d74f2febc053e5599fc828e2683ff4dbf3b
--- /dev/null
+++ b/apps/user_ldap/l10n/oc.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Ajuda"
+);
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index 0a3dea14c94a6a593147da8dbd2508b27aada212..55110b8a8308313c216076cb517ea120a1191ed3 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<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 needs 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.",
 "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",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index 1b21b899a2e12a34459fc0478ffee18ffce30095..9059f17876968a022e4236fdf3affec6922f4238 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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> A aplicaÃ§Ã£o user_ldap e user_webdavauth sÃ£o incompativeis. A aplicaÃ§Ã£o pode tornar-se instÃ¡vel. Por favor, peÃ§a ao seu administrador para desactivar uma das aplicaÃ§Ãµes.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O mÃ³dulo PHP LDAP necessÃ¡rio nÃ£o estÃ¡ instalado, o backend nÃ£o irÃ¡ funcionar. PeÃ§a ao seu administrador para o instalar.",
+"<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, logo nÃ£o irÃ¡ funcionar. Por favor peÃ§a ao administrador para o instalar.",
 "Host" => "AnfitriÃ£o",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
 "Base DN" => "DN base",
+"One Base DN per line" => "Uma base DN por linho",
 "You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar o ND Base para utilizadores e grupos no separador AvanÃ§ado",
 "User DN" => "DN do utilizador",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "O DN to cliente ",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Sem nenhuma variÃ¡vel. Exemplo: \"objectClass=posixGroup\".",
 "Port" => "Porto",
 "Base User Tree" => "Base da Ã¡rvore de utilizadores.",
+"One User Base DN per line" => "Uma base de utilizador DN por linha",
 "Base Group Tree" => "Base da Ã¡rvore de grupos.",
+"One Group Base DN per line" => "Uma base de grupo DN por linha",
 "Group-Member association" => "Associar utilizador ao grupo.",
 "Use TLS" => "Usar TLS",
 "Do not use it for SSL connections, it will fail." => "NÃ£o use para ligaÃ§Ãµes SSL, irÃ¡ falhar.",
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index b4d7d4902fecea59fabe599933dc7e922ea93d6a..d83c890b747ab20cd460515985d48b42fb80e8c6 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Este posibil sa experimentati un comportament neasteptat. VÄƒ rugÄƒm sÄƒ Ã®ntrebaÈ›i administratorul de sistem pentru a dezactiva una dintre ele.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atentie:</b Modulul PHP LDAP care este necesar nu este instalat. Va rugam intrebati administratorul de sistem instalarea acestuia",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>AtenÈ›ie</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcÈ›iona. ContacteazÄƒ administratorul sistemului pentru al instala.",
 "Host" => "GazdÄƒ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "PuteÈ›i omite protocolul, decÃ¢t dacÄƒ folosiÈ›i SSL. Atunci se Ã®ncepe cu ldaps://",
 "Base DN" => "DN de bazÄƒ",
+"One Base DN per line" => "Un Base DN pe linie",
 "You can specify Base DN for users and groups in the Advanced tab" => "PuteÈ›i sÄƒ specificaÈ›i DN de bazÄƒ pentru utilizatori È™i grupuri Ã®n fila Avansat",
 "User DN" => "DN al utilizatorului",
 "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-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.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "fÄƒrÄƒ substituenÈ›i, d.e. \"objectClass=posixGroup\"",
 "Port" => "Portul",
 "Base User Tree" => "Arborele de bazÄƒ al Utilizatorilor",
+"One User Base DN per line" => "Un User Base DN pe linie",
 "Base Group Tree" => "Arborele de bazÄƒ al Grupurilor",
+"One Group Base DN per line" => "Un Group Base DN pe linie",
 "Group-Member association" => "Asocierea Grup-Membru",
 "Use TLS" => "UtilizeazÄƒ TLS",
 "Do not use it for SSL connections, it will fail." => "A nu se utiliza pentru conexiuni SSL, va eÈ™ua.",
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index f41a0b058387414ca48f4cdbfda67faa62ceee51..42fba32f43fcf0adf94a6be1c6200564383a6e46 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¹ PHP LDAP Ð¼Ð¾Ð´ÑƒÐ»ÑŒ Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾.",
 "Host" => "Ð¡ÐµÑ€Ð²ÐµÑ€",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "ÐœÐ¾Ð¶Ð½Ð¾ Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», Ð·Ð° Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸ÐµÐ¼ Ñ‚Ð¾Ð³Ð¾, ÐºÐ¾Ð³Ð´Ð° Ð²Ð°Ð¼ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ SSL. Ð¢Ð¾Ð³Ð´Ð° Ð½Ð°Ñ‡Ð½Ð¸Ñ‚Ðµ Ñ ldaps :/ /",
 "Base DN" => "Ð‘Ð°Ð·Ð¾Ð²Ñ‹Ð¹ DN",
diff --git a/apps/user_ldap/l10n/ru_RU.php b/apps/user_ldap/l10n/ru_RU.php
index 09d7899249a29b48c3519d626a85606dbf764e4b..03d83b80a43ebe5975f569ecffcad72c8e2a9ee5 100644
--- a/apps/user_ldap/l10n/ru_RU.php
+++ b/apps/user_ldap/l10n/ru_RU.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ:</b> ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¹ PHP LDAP-Ð¼Ð¾Ð´ÑƒÐ»ÑŒ Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, backend Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ:</b> ÐœÐ¾Ð´ÑƒÐ»ÑŒ PHP LDAP Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð±ÑÐºÑÐ½Ð´ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº Ð’Ð°ÑˆÐµÐ¼Ñƒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾.",
 "Host" => "Ð¥Ð¾ÑÑ‚",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», ÐµÑÐ»Ð¸ Ð’Ð°Ð¼ Ð½Ðµ Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ÑÑ SSL. Ð—Ð°Ñ‚ÐµÐ¼ Ð½Ð°Ñ‡Ð½Ð¸Ñ‚Ðµ Ñ ldaps://",
 "Base DN" => "Ð‘Ð°Ð·Ð° DN",
+"One Base DN per line" => "ÐžÐ´Ð½Ð¾ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ",
 "You can specify Base DN for users and groups in the Advanced tab" => "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð´Ð°Ñ‚ÑŒ Base DN Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿ Ð²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÐµ Â«Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Â»",
 "User DN" => "DN Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN ÐºÐ»Ð¸ÐµÐ½Ñ‚ÑÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ð´Ð¾Ð»Ð¶Ð½Ð° Ð¾ÑÑƒÑ‰ÐµÑÑ‚Ð²Ð»ÑÑ‚ÑŒÑÑ Ð¿Ñ€Ð¸Ð²ÑÐ·ÐºÐ°, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, uid=agent,dc=example,dc=com. Ð”Ð»Ñ Ð°Ð½Ð¾Ð½Ð¸Ð¼Ð½Ð¾Ð³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð° Ð¾ÑÑ‚Ð°Ð²ÑŒÑ‚Ðµ Ð¿Ð¾Ð»Ñ DN Ð¸ ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼Ð¸.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "Ð±ÐµÐ· ÐºÐ°ÐºÐ¸Ñ…-Ð»Ð¸Ð±Ð¾ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÐµÐ¹, Ð½Ð°Ð¿Ñ€Ð¸Ð¼ÐµÑ€, \"objectClass=posixGroup\".",
 "Port" => "ÐŸÐ¾Ñ€Ñ‚",
 "Base User Tree" => "Ð‘Ð°Ð·Ð¾Ð²Ð¾Ðµ Ð´ÐµÑ€ÐµÐ²Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹",
+"One User Base DN per line" => "ÐžÐ´Ð½Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¾Ðµ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ",
 "Base Group Tree" => "Ð‘Ð°Ð·Ð¾Ð²Ð¾Ðµ Ð´ÐµÑ€ÐµÐ²Ð¾ Ð³Ñ€ÑƒÐ¿Ð¿",
+"One Group Base DN per line" => "ÐžÐ´Ð½Ð¾ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ðµ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ",
 "Group-Member association" => "Ð¡Ð²ÑÐ·ÑŒ Ñ‡Ð»ÐµÐ½-Ð³Ñ€ÑƒÐ¿Ð¿Ð°",
 "Use TLS" => "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÑŒ TLS",
 "Do not use it for SSL connections, it will fail." => "ÐÐµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑÑ‚Ð¾ SSL-ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ð¹, ÑÑ‚Ð¾ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¾.",
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 1d1fc33a83bc05d35d0204a1c682be3361e59610..247f2bfdcbd73550e7a7456b23c70a48ff9b5e29 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista zdruÅ¾ljivi. Morda boste opazili nepriÄakovano obnaÅ¡anje sistema. Prosimo, prosite vaÅ¡ega skrbnika, da eno od aplikacij onemogoÄi.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> PHP LDAP modul mora biti nameÅ¡Äen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vaÅ¡ega skrbnika, Äe ga namesti.",
 "Host" => "Gostitelj",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuÅ¡Äen, Äe ni posebej zahtevan SSL. V tem primeru se mora naslov zaÄeti z ldaps://",
 "Base DN" => "Osnovni DN",
diff --git a/apps/user_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
new file mode 100644
index 0000000000000000000000000000000000000000..fff39aadc2403a97e089fb11e9a2840f0456764e
--- /dev/null
+++ b/apps/user_ldap/l10n/sr.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "ÐŸÐ¾Ð¼Ð¾Ñ›"
+);
diff --git a/apps/user_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
new file mode 100644
index 0000000000000000000000000000000000000000..91503315066c42bb31391ed0f1ea03a8c3fb95b3
--- /dev/null
+++ b/apps/user_ldap/l10n/sr@latin.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Help" => "PomoÄ‡"
+);
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index e8e14af7aca799c720f738b0306e596c9df2934d..25abfdd7ddb092469d2540b7ffe3ee41611dbec5 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -1,9 +1,10 @@
 <?php $TRANSLATIONS = array(
 "<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>Varning:</b> Apps user_ldap och user_webdavauth Ã¤r inkompatibla. OvÃ¤ntade problem kan uppstÃ¥. Be din systemadministratÃ¶r att inaktivera en av dom.",
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP-modulen mÃ¥ste vara installerad, serversidan kommer inte att fungera. Be din systemadministratÃ¶r att installera den.",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP - modulen Ã¤r inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratÃ¶r fÃ¶r installation.",
 "Host" => "Server",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behÃ¶ver inte ange protokoll fÃ¶rutom om du anvÃ¤nder SSL. Starta dÃ¥ med ldaps://",
 "Base DN" => "Start DN",
+"One Base DN per line" => "Ett Start DN per rad",
 "You can specify Base DN for users and groups in the Advanced tab" => "Du kan ange start DN fÃ¶r anvÃ¤ndare och grupper under fliken Avancerat",
 "User DN" => "AnvÃ¤ndare 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 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.",
@@ -20,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "utan platshÃ¥llare, t.ex. \"objectClass=posixGroup\".",
 "Port" => "Port",
 "Base User Tree" => "Bas fÃ¶r anvÃ¤ndare i katalogtjÃ¤nst",
+"One User Base DN per line" => "En AnvÃ¤ndare start DN per rad",
 "Base Group Tree" => "Bas fÃ¶r grupper i katalogtjÃ¤nst",
+"One Group Base DN per line" => "En Grupp start DN per rad",
 "Group-Member association" => "Attribut fÃ¶r gruppmedlemmar",
 "Use TLS" => "AnvÃ¤nd TLS",
 "Do not use it for SSL connections, it will fail." => "AnvÃ¤nd inte fÃ¶r SSL-anslutningar, det kommer inte att fungera.",
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index acc7a4936bcca688c8a72dbe2f89686fdb1fa640..e3a941c424484593194a272b78437409c62d2c23 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -1,7 +1,10 @@
 <?php $TRANSLATIONS = array(
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them." => "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¹à¸à¸›à¸¯ user_ldap à¹à¸¥à¸° user_webdavauth à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸£à¹ˆà¸§à¸¡à¸à¸±à¸™à¹„à¸”à¹‰. à¸„à¸¸à¸“à¸à¸²à¸ˆà¸›à¸£à¸°à¸ªà¸žà¸›à¸±à¸à¸«à¸²à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸„à¸²à¸”à¸„à¸´à¸”à¸ˆà¸²à¸à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸“à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§ à¸à¸£à¸¸à¸“à¸²à¸•à¸´à¸”à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸£à¸°à¸‡à¸±à¸šà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸à¸›à¸¯ à¸•à¸±à¸§à¹ƒà¸”à¸•à¸±à¸§à¸«à¸™à¸¶à¹ˆà¸‡à¸‚à¹‰à¸²à¸‡à¸•à¹‰à¸™",
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¹‚à¸¡à¸”à¸¹à¸¥ PHP LDAP à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡, à¸£à¸°à¸šà¸šà¸”à¹‰à¸²à¸™à¸«à¸¥à¸±à¸‡à¸ˆà¸°à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰ à¸à¸£à¸¸à¸“à¸²à¸•à¸´à¸”à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸—à¸³à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹‚à¸¡à¸”à¸¹à¸¥à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§",
 "Host" => "à¹‚à¸®à¸ªà¸•à¹Œ",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸›à¸¥à¹ˆà¸à¸¢à¸Šà¹ˆà¸à¸‡à¹‚à¸›à¸£à¹‚à¸•à¸„à¸à¸¥à¹€à¸§à¹‰à¸™à¹„à¸§à¹‰à¹„à¸”à¹‰, à¸¢à¸à¹€à¸§à¹‰à¸™à¸à¸£à¸“à¸µà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹ƒà¸Šà¹‰ SSL à¸ˆà¸²à¸à¸™à¸±à¹‰à¸™à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¸”à¹‰à¸§à¸¢ ldaps://",
 "Base DN" => "DN à¸à¸²à¸™",
+"One Base DN per line" => "à¸«à¸™à¸¶à¹ˆà¸‡ Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”",
 "You can specify Base DN for users and groups in the Advanced tab" => "à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸£à¸°à¸šà¸¸ DN à¸«à¸¥à¸±à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¹ˆà¸²à¸‡à¹†à¹ƒà¸™à¹à¸—à¹‡à¸šà¸‚à¸±à¹‰à¸™à¸ªà¸¹à¸‡à¹„à¸”à¹‰",
 "User DN" => "DN à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
 "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¹€à¸›à¹‡à¸™à¸¥à¸¹à¸à¸„à¹‰à¸²à¸à¸°à¹„à¸£à¸à¹‡à¸•à¸²à¸¡à¸—à¸µà¹ˆà¸œà¸¹à¸à¸à¸¢à¸¹à¹ˆà¸”à¹‰à¸§à¸¢ à¹€à¸Šà¹ˆà¸™ uid=agent, dc=example, dc=com, à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹‚à¸”à¸¢à¸šà¸¸à¸„à¸„à¸¥à¸™à¸´à¸£à¸™à¸²à¸¡, à¹ƒà¸«à¹‰à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡ DN à¹à¸¥à¸° à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹€à¸à¸²à¹„à¸§à¹‰",
@@ -18,7 +21,9 @@
 "without any placeholder, e.g. \"objectClass=posixGroup\"." => "à¹‚à¸”à¸¢à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡à¸¡à¸µà¸•à¸±à¸§à¸¢à¸¶à¸”à¹ƒà¸”à¹†, à¹€à¸Šà¹ˆà¸™ \"objectClass=posixGroup\",",
 "Port" => "à¸žà¸à¸£à¹Œà¸•",
 "Base User Tree" => "à¸£à¸²à¸¢à¸à¸²à¸£à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree",
+"One User Base DN per line" => "à¸«à¸™à¸¶à¹ˆà¸‡ User Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”",
 "Base Group Tree" => "à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸¥à¸¸à¹ˆà¸¡à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree",
+"One Group Base DN per line" => "à¸«à¸™à¸¶à¹ˆà¸‡ Group Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”",
 "Group-Member association" => "à¸„à¸§à¸²à¸¡à¸ªà¸±à¸¡à¸žà¸±à¸™à¸˜à¹Œà¸‚à¸à¸‡à¸ªà¸¡à¸²à¸Šà¸´à¸à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡",
 "Use TLS" => "à¹ƒà¸Šà¹‰ TLS",
 "Do not use it for SSL connections, it will fail." => "à¸à¸£à¸¸à¸“à¸²à¸à¸¢à¹ˆà¸²à¹ƒà¸Šà¹‰à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¹à¸šà¸š SSL à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸ˆà¸°à¹€à¸à¸´à¸”à¸à¸²à¸£à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index f82e9f2a42039bff0473dda31c8dbc5f1565f12c..d617d939265ff24f922d8ea58acc7a787f2aae05 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -1,6 +1,5 @@
 <?php $TRANSLATIONS = array(
 "<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 needs is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ð£Ð²Ð°Ð³Ð°:</ b> ÐŸÐ¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¸Ð¹ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ PHP LDAP Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, Ð±Ð°Ð·Ð¾Ð²Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ñ‚Ð¸ Ð½Ðµ Ð±ÑƒÐ´Ðµ. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð·Ð²ÐµÑ€Ð½Ñ–Ñ‚ÑŒÑÑ Ð´Ð¾ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°, Ñ‰Ð¾Ð± Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾.",
 "Host" => "Ð¥Ð¾ÑÑ‚",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "ÐœÐ¾Ð¶Ð½Ð° Ð½Ðµ Ð²ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», ÑÐºÑ‰Ð¾ Ð²Ð°Ð¼ Ð½Ðµ Ð¿Ð¾Ñ‚Ñ€Ñ–Ð±ÐµÐ½ SSL. Ð¢Ð¾Ð´Ñ– Ð¿Ð¾Ñ‡Ð½Ñ–Ñ‚ÑŒ Ð· ldaps://",
 "Base DN" => "Ð‘Ð°Ð·Ð¾Ð²Ð¸Ð¹ DN",
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index bb961d534b739a5e41494757f6bf48206c835a1b..ed5041eff06ccc86686bcabc9a9fae066fc115e7 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"<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 ä¸å…¼å®¹ã€‚æ‚¨å¯èƒ½éé‡æœªé¢„æ–™çš„è¡Œä¸ºã€‚è¯·åž‚è¯¢æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜ç¦ç”¨å…¶ä¸ä¸€ä¸ªã€‚",
 "Host" => "ä¸»æœº",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "å¯ä»¥å¿½ç•¥åè®®ï¼Œä½†å¦‚è¦ä½¿ç”¨SSLï¼Œåˆ™éœ€ä»¥ldaps://å¼€å¤´",
 "Base DN" => "Base DN",
@@ -31,6 +32,7 @@
 "Group Display Name Field" => "ç»„æ˜¾ç¤ºåç§°å—æ®µ",
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "ç”¨æ¥ç”Ÿæˆç»„çš„ownCloudåç§°çš„LDAPå±žæ€§",
 "in bytes" => "å—èŠ‚æ•°",
+"in seconds. A change empties the cache." => "ä»¥ç§’è®¡ã€‚ä¿®æ”¹å°†æ¸…ç©ºç¼“å˜ã€‚",
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "å°†ç”¨æˆ·åç§°ç•™ç©º(é»˜è®¤)ã€‚å¦åˆ™æŒ‡å®šä¸€ä¸ªLDAP/ADå±žæ€§",
 "Help" => "å¸®åŠ©"
 );
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
index abc1b03d49dbca9e825c2d44d41e33fa274fc7c2..506ae0f0fbd711803ecbfc04301d38ac353d9a4b 100644
--- a/apps/user_ldap/l10n/zh_TW.php
+++ b/apps/user_ldap/l10n/zh_TW.php
@@ -1,5 +1,7 @@
 <?php $TRANSLATIONS = array(
+"Host" => "ä¸»æ©Ÿ",
 "Password" => "å¯†ç¢¼",
+"Port" => "é€£æŽ¥é˜œ",
 "Use TLS" => "ä½¿ç”¨TLS",
 "Turn off SSL certificate validation." => "é—œé–‰ SSL æ†‘è‰é©—è‰",
 "Help" => "èªªæ˜Ž"
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index f888577aedb59adced4e8dbd56f08f56431797db..422e43fc003469c98a2569e93c9eaf835e2e18a5 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -114,6 +114,15 @@ abstract class Access {
 	 * @return the sanitized DN
 	 */
 	private function sanitizeDN($dn) {
+		//treating multiple base DNs
+		if(is_array($dn)) {
+			$result = array();
+			foreach($dn as $singleDN) {
+			    $result[] = $this->sanitizeDN($singleDN);
+			}
+			return $result;
+		}
+
 		//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);
 
@@ -212,9 +221,13 @@ abstract class Access {
 	 * 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) {
-		if(mb_strripos($dn, $this->sanitizeDN($this->connection->ldapBaseGroups), 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->sanitizeDN($this->connection->ldapBaseGroups), 'UTF-8'))) {
+		//To avoid bypassing the base DN settings under certain circumstances
+		//with the group support, check whether the provided DN matches one of
+		//the given Bases
+		if(!$this->isDNPartOfBase($dn, $this->connection->ldapBaseGroups)) {
 			return false;
 		}
+
 		return $this->dn2ocname($dn, $ldapname, false);
 	}
 
@@ -227,9 +240,13 @@ abstract class Access {
 	 * returns the internal ownCloud name for the given LDAP DN of the user, false on DN outside of search DN or failure
 	 */
 	public function dn2username($dn, $ldapname = null) {
-		if(mb_strripos($dn, $this->sanitizeDN($this->connection->ldapBaseUsers), 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($this->sanitizeDN($this->connection->ldapBaseUsers), 'UTF-8'))) {
+		//To avoid bypassing the base DN settings under certain circumstances
+		//with the group support, check whether the provided DN matches one of
+		//the given Bases
+		if(!$this->isDNPartOfBase($dn, $this->connection->ldapBaseUsers)) {
 			return false;
 		}
+
 		return $this->dn2ocname($dn, $ldapname, true);
 	}
 
@@ -521,7 +538,7 @@ abstract class Access {
 	/**
 	 * @brief executes an LDAP search
 	 * @param $filter the LDAP filter for the search
-	 * @param $base the LDAP subtree that shall be searched
+	 * @param $base an array containing the LDAP subtree(s) that shall be searched
 	 * @param $attr optional, when a certain attribute shall be filtered out
 	 * @returns array with the search result
 	 *
@@ -544,18 +561,28 @@ abstract class Access {
 		//check wether paged search should be attempted
 		$pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, $limit, $offset);
 
-		$sr = ldap_search($link_resource, $base, $filter, $attr);
-		if(!$sr) {
+		$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);
 			\OCP\Util::writeLog('user_ldap', 'Attempt for Paging?  '.print_r($pagedSearchOK, true), \OCP\Util::ERROR);
 			return array();
 		}
-		$findings = ldap_get_entries($link_resource, $sr );
+		$findings = array();
+		foreach($sr as $key => $res) {
+		    $findings = array_merge($findings, ldap_get_entries($link_resource, $res ));
+		}
 		if($pagedSearchOK) {
 			\OCP\Util::writeLog('user_ldap', 'Paged search successful', \OCP\Util::INFO);
-			ldap_control_paged_result_response($link_resource, $sr, $cookie);
-			\OCP\Util::writeLog('user_ldap', 'Set paged search cookie '.$cookie, \OCP\Util::INFO);
-			$this->setPagedResultCookie($filter, $limit, $offset, $cookie);
+			foreach($sr as $key => $res) {
+				$cookie = null;
+				if(ldap_control_paged_result_response($link_resource, $res, $cookie)) {
+					\OCP\Util::writeLog('user_ldap', 'Set paged search cookie', \OCP\Util::INFO);
+					$this->setPagedResultCookie($base[$key], $filter, $limit, $offset, $cookie);
+				}
+			}
+
 			//browsing through prior pages to get the cookie for the new one
 			if($skipHandling) {
 				return;
@@ -565,7 +592,9 @@ abstract class Access {
 				$this->pagedSearchedSuccessful = true;
 			}
 		} else {
-			\OCP\Util::writeLog('user_ldap', 'Paged search failed :(', \OCP\Util::INFO);
+			if(!is_null($limit)) {
+				\OCP\Util::writeLog('user_ldap', 'Paged search failed :(', \OCP\Util::INFO);
+			}
 		}
 
 		// if we're here, probably no connection resource is returned.
@@ -791,20 +820,41 @@ abstract class Access {
 		return str_replace('\\5c', '\\', $dn);
 	}
 
+	/**
+	 * @brief checks if the given DN is part of the given base DN(s)
+	 * @param $dn the DN
+	 * @param $bases array containing the allowed base DN or DNs
+	 * @returns Boolean
+	 */
+	private function isDNPartOfBase($dn, $bases) {
+		$bases = $this->sanitizeDN($bases);
+		foreach($bases as $base) {
+			$belongsToBase = true;
+			if(mb_strripos($dn, $base, 0, 'UTF-8') !== (mb_strlen($dn, 'UTF-8')-mb_strlen($base))) {
+				$belongsToBase = false;
+			}
+			if($belongsToBase) {
+				break;
+			}
+		}
+		return $belongsToBase;
+	}
+
 	/**
 	 * @brief get a cookie for the next LDAP paged search
+	 * @param $base a string with the base DN for the search
 	 * @param $filter the search filter to identify the correct search
 	 * @param $limit the limit (or 'pageSize'), to identify the correct search well
 	 * @param $offset the offset for the new search to identify the correct search really good
 	 * @returns string containing the key or empty if none is cached
 	 */
-	private function getPagedResultCookie($filter, $limit, $offset) {
+	private function getPagedResultCookie($base, $filter, $limit, $offset) {
 		if($offset == 0) {
 			return '';
 		}
 		$offset -= $limit;
 		//we work with cache here
-		$cachekey = 'lc' . dechex(crc32($filter)) . '-' . $limit . '-' . $offset;
+		$cachekey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' . $limit . '-' . $offset;
 		$cookie = $this->connection->getFromCache($cachekey);
 		if(is_null($cookie)) {
 			$cookie = '';
@@ -814,15 +864,16 @@ abstract class Access {
 
 	/**
 	 * @brief set a cookie for LDAP paged search run
+	 * @param $base a string with the base DN for the search
 	 * @param $filter the search filter to identify the correct search
 	 * @param $limit the limit (or 'pageSize'), to identify the correct search well
 	 * @param $offset the offset for the run search to identify the correct search really good
 	 * @param $cookie string containing the cookie returned by ldap_control_paged_result_response
 	 * @return void
 	 */
-	private function setPagedResultCookie($filter, $limit, $offset) {
+	private function setPagedResultCookie($base, $filter, $limit, $offset, $cookie) {
 		if(!empty($cookie)) {
-			$cachekey = 'lc' . dechex(crc32($filter)) . '-' . $limit . '-' . $offset;
+			$cachekey = 'lc' . dechex(crc32($base)) . '-' . dechex(crc32($filter)) . '-' .$limit . '-' . $offset;
 			$cookie = $this->connection->writeToCache($cachekey, $cookie);
 		}
 	}
@@ -841,40 +892,47 @@ abstract class Access {
 	/**
 	 * @brief prepares a paged search, if possible
 	 * @param $filter the LDAP filter for the search
-	 * @param $base the LDAP subtree that shall be searched
+	 * @param $bases an array containing the LDAP subtree(s) that shall be searched
 	 * @param $attr optional, when a certain attribute shall be filtered outside
 	 * @param $limit
 	 * @param $offset
 	 *
 	 */
-	private function initPagedSearch($filter, $base, $attr, $limit, $offset) {
+	private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
 		$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 '.$base.' attr '.print_r($attr, true). ' limit ' .$limit.' offset '.$offset, \OCP\Util::DEBUG);
+			\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
-			$cookie = $this->getPagedResultCookie($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?)
-				$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);
-				$this->search($filter, $base, $attr, $limit, $reOffset, true);
-				$cookie = $this->getPagedResultCookie($filter, $limit, $offset);
-				//still no cookie? obviously, the server does not like us. Let's skip paging efforts.
-				//TODO: remember this, probably does not change in the next request...
-				if(empty($cookie)) {
-					$cookie = null;
+			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?)
+					$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);
+					$this->search($filter, $base, $attr, $limit, $reOffset, true);
+					$cookie = $this->getPagedResultCookie($base, $filter, $limit, $offset);
+					//still no cookie? obviously, the server does not like us. Let's skip paging efforts.
+					//TODO: remember this, probably does not change in the next request...
+					if(empty($cookie)) {
+						$cookie = null;
+					}
 				}
-			}
-			if(!is_null($cookie)) {
-				if($offset > 0) {
-					\OCP\Util::writeLog('user_ldap', 'Cookie '.$cookie, \OCP\Util::INFO);
+				if(!is_null($cookie)) {
+					if($offset > 0) {
+						\OCP\Util::writeLog('user_ldap', 'Cookie '.$cookie, \OCP\Util::INFO);
+					}
+					$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);
 				}
-				$pagedSearchOK = ldap_control_paged_result($this->connection->getConnectionResource(), $limit, false, $cookie);
-				\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);
+
 			}
 		}
 
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index b14cdafff89809cf3b0780d3cac7d2cdcad475e0..7046cbbfc78d9776e267d1686424d341e8c217f7 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -187,9 +187,9 @@ class Connection {
 			$this->config['ldapPort']              = \OCP\Config::getAppValue($this->configID, 'ldap_port', 389);
 			$this->config['ldapAgentName']         = \OCP\Config::getAppValue($this->configID, 'ldap_dn', '');
 			$this->config['ldapAgentPassword']     = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password', ''));
-			$this->config['ldapBase']              = \OCP\Config::getAppValue($this->configID, 'ldap_base', '');
-			$this->config['ldapBaseUsers']         = \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']);
-			$this->config['ldapBaseGroups']        = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']);
+			$this->config['ldapBase']              = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base', ''));
+			$this->config['ldapBaseUsers']         = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']));
+			$this->config['ldapBaseGroups']        = preg_split('/\r\n|\r|\n/', \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']));
 			$this->config['ldapTLS']               = \OCP\Config::getAppValue($this->configID, 'ldap_tls', 0);
 			$this->config['ldapNoCase']            = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0);
 			$this->config['turnOffCertCheck']      = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0);
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 8522d2f835cac26d7a63249efd2e0386856fcaf8..b24c6e2f0256a092861b816dbfadffcdbb86f2db 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -8,12 +8,12 @@
 			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>';
 		}
 		if(!function_exists('ldap_connect')) {
-			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>';
+			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>';
 		}
 		?>
 	<fieldset id="ldapSettings-1">
 		<p><label for="ldap_host"><?php echo $l->t('Host');?></label><input type="text" id="ldap_host" name="ldap_host" value="<?php echo $_['ldap_host']; ?>" 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><input type="text" id="ldap_base" name="ldap_base" value="<?php echo $_['ldap_base']; ?>" title="<?php echo $l->t('You can specify Base DN for users and groups in the Advanced tab');?>" /></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');?>"><?php echo $_['ldap_base']; ?></textarea></p>
 		<p><label for="ldap_dn"><?php echo $l->t('User DN');?></label><input type="text" id="ldap_dn" name="ldap_dn" value="<?php echo $_['ldap_dn']; ?>" 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" value="<?php echo $_['ldap_agent_password']; ?>" 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" value="<?php echo $_['ldap_login_filter']; ?>" 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>
@@ -22,8 +22,8 @@
 	</fieldset>
 	<fieldset id="ldapSettings-2">
 		<p><label for="ldap_port"><?php echo $l->t('Port');?></label><input type="text" id="ldap_port" name="ldap_port" value="<?php echo $_['ldap_port']; ?>" /></p>
-		<p><label for="ldap_base_users"><?php echo $l->t('Base User Tree');?></label><input type="text" id="ldap_base_users" name="ldap_base_users" value="<?php echo $_['ldap_base_users']; ?>" /></p>
-		<p><label for="ldap_base_groups"><?php echo $l->t('Base Group Tree');?></label><input type="text" id="ldap_base_groups" name="ldap_base_groups" value="<?php echo $_['ldap_base_groups']; ?>" /></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');?>" title="<?php echo $l->t('Base User Tree');?>"><?php echo $_['ldap_base_users']; ?></textarea></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');?>" title="<?php echo $l->t('Base Group Tree');?>"><?php echo $_['ldap_base_groups']; ?></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"><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_tls"><?php echo $l->t('Use TLS');?></label><input type="checkbox" id="ldap_tls" name="ldap_tls" value="1"<?php if ($_['ldap_tls']) echo ' checked'; ?> title="<?php echo $l->t('Do not use it for SSL 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" value="1"<?php if (isset($_['ldap_nocase']) && ($_['ldap_nocase'])) echo ' checked'; ?>></p>
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index f99902d32f5cb028b4d922507c2e8af7f0f73e00..ae635597b71fcd15de2fa6b707e58fead4f3fc00 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -20,7 +20,7 @@
 *
 */
 
-class Test_Group_Ldap extends UnitTestCase {
+class Test_Group_Ldap extends PHPUnit_Framework_TestCase {
 	function setUp() {
 		OC_Group::clearBackends();
 	}
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 6591d1d5fee1442b0152a279f9f83b9d4b130828..b3180e113587a83be45b20d05a15adb214f4e418 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -156,6 +156,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 		}
 
 		$this->connection->writeToCache('userExists'.$uid, true);
+		$this->updateQuota($dn);
 		return true;
 	}
 
@@ -208,6 +209,50 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 		return false;
 	}
 
+	/**
+	 * @brief get display name of the user
+	 * @param $uid user ID of the user
+	 * @return display name
+	 */
+	public function getDisplayName($uid) {
+		$cacheKey = 'getDisplayName'.$uid;
+		if(!is_null($displayName = $this->connection->getFromCache($cacheKey))) {
+			return $displayName;
+		}
+
+		$displayName = $this->readAttribute(
+			$this->username2dn($uid),
+			$this->connection->ldapUserDisplayName);
+
+		if($displayName && (count($displayName) > 0)) {
+			$this->connection->writeToCache($cacheKey, $displayName);
+			return $displayName[0];
+		}
+
+		return null;
+	}
+
+	/**
+	 * @brief Get a list of all display names
+	 * @returns array with  all displayNames (value) and the correspondig uids (key)
+	 *
+	 * Get a list of all display names and user ids.
+	 */
+	public function getDisplayNames($search = '', $limit = null, $offset = null) {
+		$cacheKey = 'getDisplayNames-'.$search.'-'.$limit.'-'.$offset;
+		if(!is_null($displayNames = $this->connection->getFromCache($cacheKey))) {
+			return $displayNames;
+		}
+
+		$displayNames = array();
+		$users = $this->getUsers($search, $limit, $offset);
+		foreach ($users as $user) {
+			$displayNames[$user] = $this->getDisplayName($user);
+		}
+		$this->connection->writeToCache($cacheKey, $displayNames);
+		return $displayNames;
+	}
+
 		/**
 	* @brief Check if backend implements actions
 	* @param $actions bitwise-or'ed actions
diff --git a/apps/user_webdavauth/l10n/bn_BD.php b/apps/user_webdavauth/l10n/bn_BD.php
index 773e7f7eb7622c68ea374884cb0635b44a52d1f9..5366552efae004346a719cbb5d66ba2d839058b6 100644
--- a/apps/user_webdavauth/l10n/bn_BD.php
+++ b/apps/user_webdavauth/l10n/bn_BD.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "URL:http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct."
+"URL: http://" => "URL:http://"
 );
diff --git a/apps/user_webdavauth/l10n/ca.php b/apps/user_webdavauth/l10n/ca.php
index 84a6c599e78df8e85be55c45703a54134940639e..7ac540f21303d7a122d9358f843f46ed651f8b98 100644
--- a/apps/user_webdavauth/l10n/ca.php
+++ b/apps/user_webdavauth/l10n/ca.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "AutenticaciÃ³ WebDAV",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviarÃ  les credencials d'usuari a aquesta URL. S'interpretarÃ  http 401 i http 403 com a credencials incorrectes i tots els altres codis com a credencials correctes."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud enviarÃ  les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarÃ  els codis d'estat 401 i 403 com a credencials no vÃ lides, i qualsevol altra resposta com a credencials vÃ lides."
 );
diff --git a/apps/user_webdavauth/l10n/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
index 5cb9b4c370448b7023e6675d4a3be1aecc095ad2..9bd4c96a2bb4fd1bc9d4d2c104e639e4de8d9b8d 100644
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ b/apps/user_webdavauth/l10n/cs_CZ.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "OvÄ›Å™enÃ WebDAV",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud odeÅ¡le pÅ™ihlaÅ¡ovacÃ Ãºdaje uÅ¾ivatele na URL a z nÃ¡vratovÃ© hodnoty urÄÃ stav pÅ™ihlÃ¡Å¡enÃ. Http 401 a 403 vyhodnotÃ jako neplatnÃ© Ãºdaje a vÅ¡echny ostatnÃ jako ÃºspÄ›Å¡nÃ© pÅ™ihlÃ¡Å¡enÃ."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odeÅ¡le uÅ¾ivatelskÃ© Ãºdaje na zadanou URL. Plugin zkontroluje odpovÄ›Ä a povaÅ¾uje nÃ¡vratovou hodnotu HTTP 401 a 403 za neplatnÃ© Ãºdaje a vÅ¡echny ostatnÃ hodnoty jako platnÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje."
 );
diff --git a/apps/user_webdavauth/l10n/da.php b/apps/user_webdavauth/l10n/da.php
index 7d9ee1d5b293905e92153a1029decf926b16b1b8..b268d3e15d075fdf749c73e9ae877ef8c4cca48e 100644
--- a/apps/user_webdavauth/l10n/da.php
+++ b/apps/user_webdavauth/l10n/da.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV-godkendelse",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud vil sende brugerens oplysninger til denne URL. Plugin'et registrerer responsen og fortolker HTTP-statuskoder 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
 );
diff --git a/apps/user_webdavauth/l10n/de.php b/apps/user_webdavauth/l10n/de.php
index 8589dc0c4fd748bda8c874d7523389a79e8a85a5..f893bddc71ce599a7d16c97609c703427e57a150 100644
--- a/apps/user_webdavauth/l10n/de.php
+++ b/apps/user_webdavauth/l10n/de.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Authentifikation",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud wird die Logindaten zu dieser URL senden. http 401 und http 403 werden als falsche Logindaten interpretiert und alle anderen Codes als korrekte Logindaten."
+"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."
 );
diff --git a/apps/user_webdavauth/l10n/de_DE.php b/apps/user_webdavauth/l10n/de_DE.php
index 3d73dccfe8ec2a30e0d5f71e974a2e78e252ba56..8f67575fc0fd6ae8665f1f4800823fff606a5b3f 100644
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ b/apps/user_webdavauth/l10n/de_DE.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Authentifizierung",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud "
+"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."
 );
diff --git a/apps/user_webdavauth/l10n/el.php b/apps/user_webdavauth/l10n/el.php
index bf4c11af64c97eccb6a1aaa7b0e507e50d725cca..951709c4d6490dad92fd4d7e39c2ab3471722129 100644
--- a/apps/user_webdavauth/l10n/el.php
+++ b/apps/user_webdavauth/l10n/el.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Î‘Ï…Î¸ÎµÎ½Ï„Î¹ÎºÎ¿Ï€Î¿Î¯Î·ÏƒÎ· Î¼ÎÏƒÏ‰ WebDAV ",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "Î¤Î¿ ownCloud Î¸Î± ÏƒÏ„ÎµÎ¯Î»ÎµÎ¹ Ï„Î± ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¬ Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ URL, Î¼ÎµÏ„Î±Ï†ÏÎ¬Î¶Î¿Î½Ï„Î±Ï‚ Ï„Î± http 401 ÎºÎ±Î¹ http 403 Ï‰Ï‚ Î»Î±Î½Î¸Î±ÏƒÎ¼ÎÎ½Î± ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¬ ÎºÎ±Î¹ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ Î¬Î»Î»Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Ï‰Ï‚ ÏƒÏ‰ÏƒÏ„Î¬ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¬."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Î¤Î¿ ownCloud Î¸Î± ÏƒÏ„ÎµÎ¯Î»ÎµÎ¹ Ï„Î± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î±  Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ URL. Î‘Ï…Ï„ÏŒ Ï„Î¿ plugin ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¬Î½Ï„Î·ÏƒÎ· ÎºÎ±Î¹ Ï„Î·Î½ Î¼ÎµÏ„Î±Ï„ÏÎÏ€ÎµÎ¹ ÏƒÎµ HTTP ÎºÏ‰Î´Î¹ÎºÏŒ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ 401 ÎºÎ±Î¹ 403 Î³Î¹Î± Î¼Î· ÎÎ³ÎºÏ…ÏÎ±, ÏŒÎ»ÎµÏ‚ Î¿Î¹ Ï…Ï€ÏŒÎ»Î¿Î¹Ï€ÎµÏ‚ Î±Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎµÏ‚."
 );
diff --git a/apps/user_webdavauth/l10n/eo.php b/apps/user_webdavauth/l10n/eo.php
index 245a5101341d2a51e59b2cc0575b907f85eb3945..d945f181e6bf65916c5c02254c89beb858a63020 100644
--- a/apps/user_webdavauth/l10n/eo.php
+++ b/apps/user_webdavauth/l10n/eo.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV-aÅtentigo",
 "URL: http://" => "URL: http://"
 );
diff --git a/apps/user_webdavauth/l10n/es.php b/apps/user_webdavauth/l10n/es.php
index 3975b04cbc174c1e8a62ece1a8f48e61594e10af..103c3738e2d81d476fded156cf818c12ed97b23b 100644
--- a/apps/user_webdavauth/l10n/es.php
+++ b/apps/user_webdavauth/l10n/es.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "AutenticaciÃ³n de WevDAV",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviarÃ¡ al usuario las interpretaciones 401 y 403 a esta URL como incorrectas y todas las otras credenciales como correctas"
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "onwCloud enviarÃ¡ las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretarÃ¡ los cÃ³digos de respuesta HTTP 401 y 403 como credenciales invÃ¡lidas y todas las otras respuestas como credenciales vÃ¡lidas."
 );
diff --git a/apps/user_webdavauth/l10n/es_AR.php b/apps/user_webdavauth/l10n/es_AR.php
index 0606d3a8eb416254cc968a86ebafd258e00389a8..245a5101341d2a51e59b2cc0575b907f85eb3945 100644
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ b/apps/user_webdavauth/l10n/es_AR.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviarÃ¡ las credenciales a esta direcciÃ³n, si son interpretadas como http 401 o http 403 las credenciales son erroneas; todos los otros cÃ³digos indican que las credenciales son correctas."
+"URL: http://" => "URL: http://"
 );
diff --git a/apps/user_webdavauth/l10n/eu.php b/apps/user_webdavauth/l10n/eu.php
index bbda9f10ba0ef1167804fe0a48a1c8817e4b6c1e..d792c1588bbe44d7710f894c79361d610b530e24 100644
--- a/apps/user_webdavauth/l10n/eu.php
+++ b/apps/user_webdavauth/l10n/eu.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Autentikazioa",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud erabiltzailearen kredentzialak helbide honetara bidaliko ditu. http 401 eta http 403 kredentzial ez zuzenak bezala hartuko dira eta beste kode guztiak kredentzial zuzentzat hartuko dira."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloudek erabiltzailearen kredentzialak URL honetara bidaliko ditu. Plugin honek erantzuna aztertzen du eta HTTP 401 eta 403 egoera kodeak baliogabezko kredentzialtzat hartuko ditu, beste erantzunak kredentzial egokitzat hartuko dituelarik."
 );
diff --git a/apps/user_webdavauth/l10n/fr.php b/apps/user_webdavauth/l10n/fr.php
index 557a22e6c82e39bebe25b0f8a946397d24b8e918..9d528a3a9d216efbc2a776cf018a4b2af7d4cc86 100644
--- a/apps/user_webdavauth/l10n/fr.php
+++ b/apps/user_webdavauth/l10n/fr.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Authentification WebDAV",
 "URL: http://" => "URL : http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud "
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud enverra les informations de connexion Ã  cette adresse. Ce module complÃ©mentaire analyse le code rÃ©ponse HTTP et considÃ¨re tout code diffÃ©rent des codes 401 et 403 comme associÃ© Ã  une authentification correcte."
 );
diff --git a/apps/user_webdavauth/l10n/gl.php b/apps/user_webdavauth/l10n/gl.php
index fa81db333d4ac58c5cee761b868fce1098a15b47..a6b8355c07433c653ed89d68217bcc9133750b81 100644
--- a/apps/user_webdavauth/l10n/gl.php
+++ b/apps/user_webdavauth/l10n/gl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "AutenticaciÃ³n WebDAV",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud enviarÃ¡ as credenciais do usuario a este URL,  http 401 e http 403 interpretanse como credenciais incorrectas e todos os outros cÃ³digos  como credenciais correctas."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud enviarÃ¡ as credenciais do usuario a esta URL. Este conector comproba a resposta e interpretarÃ¡ os cÃ³digos de estado 401 e 403 como credenciais non vÃ¡lidas, e todas as outras respostas como credenciais vÃ¡lidas."
 );
diff --git a/apps/user_webdavauth/l10n/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
index 75a23ed7be488de0c8f8e81c40c6026a0bd52792..643528011425d7d96c27f4159d2929e66ac27fa7 100644
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ b/apps/user_webdavauth/l10n/hu_HU.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV hitelesÃtÃ©s",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "Az ownCloud rendszer erre a cÃmre fogja elkÃ¼ldeni a felhasznÃ¡lÃ³k bejelentkezÃ©si adatait. Ha 401-es vagy 403-as http kÃ³dot kap vissza, azt sikertelen azonosÃtÃ¡skÃ©nt fogja Ã©rtelmezni, minden mÃ¡s kÃ³dot sikeresnek fog tekinteni."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "Az ownCloud elkÃ¼ldi a felhasznÃ¡lÃ³i fiÃ³k adatai a kÃ¶vetkezÅ‘ URL-re. Ez a bÅ‘vÃtÅ‘modul leellenÅ‘rzi a vÃ¡laszt Ã©s ha a HTTP hibakÃ³d nem 401 vagy 403 azaz Ã©rvÃ©nytelen hitelesÃtÅ‘, akkor minden mÃ¡s vÃ¡lasz Ã©rvÃ©nyes lesz."
 );
diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php
index 13d9a1fe8f408f9975edd5d6d98fddf0935d5961..8fe0d974b321e9342567b22b0788d794bccbbb5c 100644
--- a/apps/user_webdavauth/l10n/is.php
+++ b/apps/user_webdavauth/l10n/is.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "VefslÃ³Ã°: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud mun senda auÃ°kenni notenda Ã¡ Ã¾essa vefslÃ³Ã° og tÃºkla svÃ¶rin http 401 og http 403 sem rangar auÃ°kenniupplÃ½singar og Ã¶ll Ã¶nnur svÃ¶r sem rÃ©tt."
+"URL: http://" => "VefslÃ³Ã°: http://"
 );
diff --git a/apps/user_webdavauth/l10n/it.php b/apps/user_webdavauth/l10n/it.php
index b0abf2f20822d085ed0368447ca30be94da93d55..a7cd6e8e4b4237d82768491444c7c7de59364008 100644
--- a/apps/user_webdavauth/l10n/it.php
+++ b/apps/user_webdavauth/l10n/it.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Autenticazione WebDAV",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud invierÃ  le credenziali dell'utente a questo URL. Interpreta i codici http 401 e http 403 come credenziali errate e tutti gli altri codici come credenziali corrette."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud invierÃ  le credenziali dell'utente a questo URL. Questa estensione controlla la risposta e interpreta i codici di stato 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
 );
diff --git a/apps/user_webdavauth/l10n/ja_JP.php b/apps/user_webdavauth/l10n/ja_JP.php
index 8643805ffccc79b14edd2f97d38dcb49b6f2c6d4..1cd14a03c727fe6292163c2f6e7b8ace978c596e 100644
--- a/apps/user_webdavauth/l10n/ja_JP.php
+++ b/apps/user_webdavauth/l10n/ja_JP.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV èªè¨¼",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloudã®ã“ã®URLã¸ã®ãƒ¦ãƒ¼ã‚¶è³‡æ ¼æƒ…å ±ã®é€ä¿¡ã¯ã€è³‡æ ¼æƒ…å ±ãŒé–“é•ã£ã¦ã„ã‚‹å ´åˆã¯HTTP401ã‚‚ã—ãã¯403ã‚’è¿”ã—ã€æ£ã—ã„å ´åˆã¯å…¨ã¦ã®ã‚³ãƒ¼ãƒ‰ã‚’è¿”ã—ã¾ã™ã€‚"
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloudã¯ã“ã®URLã«ãƒ¦ãƒ¼ã‚¶è³‡æ ¼æƒ…å ±ã‚’é€ä¿¡ã—ã¾ã™ã€‚ã“ã®ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯å¿œç”ã‚’ãƒã‚§ãƒƒã‚¯ã—ã€HTTPçŠ¶æ…‹ã‚³ãƒ¼ãƒ‰ãŒ 401 ã¨ 403 ã®å ´åˆã¯ç„¡åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã€ä»–ã®å¿œç”ã¯ã™ã¹ã¦æœ‰åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã¦å‡¦ç†ã—ã¾ã™ã€‚"
 );
diff --git a/apps/user_webdavauth/l10n/ko.php b/apps/user_webdavauth/l10n/ko.php
index a806df750f7141e3dd8a78b5dced3ae3194b6697..245a5101341d2a51e59b2cc0575b907f85eb3945 100644
--- a/apps/user_webdavauth/l10n/ko.php
+++ b/apps/user_webdavauth/l10n/ko.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloudëŠ” ì´ URLë¡œ ìœ ì € ì¸ì¦ì„ ë³´ë‚´ê²Œ ë˜ë©°, http 401 ê³¼ http 403ì€ ì¸ì¦ ì˜¤ë¥˜ë¡œ, ê·¸ ì™¸ ì½”ë“œëŠ” ì¸ì¦ì´ ì˜¬ë°”ë¥¸ ê²ƒìœ¼ë¡œ í•´ì„í•©ë‹ˆë‹¤."
+"URL: http://" => "URL: http://"
 );
diff --git a/apps/user_webdavauth/l10n/nl.php b/apps/user_webdavauth/l10n/nl.php
index 687442fb66575e6e67120d1b411abb99d8cbe460..7d1bb33923eefb3dc44730d1871022804202c2a4 100644
--- a/apps/user_webdavauth/l10n/nl.php
+++ b/apps/user_webdavauth/l10n/nl.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV authenticatie",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud zal de inloggegevens naar deze URL als geÃ¯nterpreteerde http 401 en http 403 als de inloggegevens onjuist zijn. Andere codes als de inloggegevens correct zijn."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens."
 );
diff --git a/apps/user_webdavauth/l10n/pl.php b/apps/user_webdavauth/l10n/pl.php
index 245a5101341d2a51e59b2cc0575b907f85eb3945..4887e935316cb15a916da4883004ba9cf62eaa50 100644
--- a/apps/user_webdavauth/l10n/pl.php
+++ b/apps/user_webdavauth/l10n/pl.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://"
+"WebDAV Authentication" => "Uwierzytelnienie WebDAV",
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud wyÅ›le dane uwierzytelniajÄ…ce do tego URL. Ten plugin sprawdza odpowiedÅº i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidÅ‚owe dane uwierzytelniajÄ…ce, a kaÅ¼dy inny kod odpowiedzi jako poprawne dane."
 );
diff --git a/apps/user_webdavauth/l10n/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
index e8bfcfda81ec297a94221c6e240c9baec8f7fd60..d7e87b5c8d19c326eacbbe40394b9a253955fcc5 100644
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ b/apps/user_webdavauth/l10n/pt_PT.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "AutenticaÃ§Ã£o WebDAV",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "O ownCloud vai enviar as credenciais para este URL. Todos os cÃ³digos http 401 e 403 serÃ£o interpretados como credenciais invÃ¡lidas, todos os restantes cÃ³digos http serÃ£o interpretados como credenciais correctas."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "O ownCloud vai enviar as credenciais do utilizador atravÃ©s deste URL. Este plugin verifica a resposta e vai interpretar os cÃ³digos de estado HTTP 401 e 403 como credenciais invÃ¡lidas, e todas as outras como vÃ¡lidas."
 );
diff --git a/apps/user_webdavauth/l10n/ro.php b/apps/user_webdavauth/l10n/ro.php
index 17157da044d5eaf30a2d8b324b0826084075a31a..9df490e81ecc4489b4f9e8227e96b5b87836b28f 100644
--- a/apps/user_webdavauth/l10n/ro.php
+++ b/apps/user_webdavauth/l10n/ro.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "Autentificare WebDAV",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "owncloud  va trimite acreditatile de utilizator pentru a interpreta aceasta pagina. Http 401 si Http 403 are acreditarile si orice alt cod gresite ca acreditarile corecte"
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud va trimite datele de autentificare la acest URL. Acest modul verificÄƒ rÄƒspunsul È™i va interpreta codurile de status HTTP 401 sau 403 ca fiind date de autentificare invalide, È™i orice alt rÄƒspuns ca fiind date valide."
 );
diff --git a/apps/user_webdavauth/l10n/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
index 9bd32954b058d9ad5c43d6604e9ba18e4bd559f3..27f84a24f8b5ac4f91935bb4f9e1ee4f55ce94a2 100644
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ b/apps/user_webdavauth/l10n/sk_SK.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"WebDAV Authentication" => "WebDAV overenie",
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud odoÅ¡le pouÅ¾ÃvateÄ¾skÃ© Ãºdajena zadanÃº URL. Plugin skontroluje odpoveÄ a povaÅ¾uje nÃ¡vratovou hodnotu HTTP 401 a 403 za neplatnÃ© Ãºdaje a vÅ¡etky ostatnÃ© hodnoty ako platnÃ© prihlasovacie Ãºdaje."
 );
diff --git a/apps/user_webdavauth/l10n/sl.php b/apps/user_webdavauth/l10n/sl.php
index 8f4effc81a198d8908259796381d49eb9f72ec09..245a5101341d2a51e59b2cc0575b907f85eb3945 100644
--- a/apps/user_webdavauth/l10n/sl.php
+++ b/apps/user_webdavauth/l10n/sl.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud bo poslal uporabniÅ¡ka poverila temu URL naslovu. Pri tem bo interpretiral http 401 in http 403 odgovor kot spodletelo avtentikacijo ter vse ostale http odgovore kot uspeÅ¡ne."
+"URL: http://" => "URL: http://"
 );
diff --git a/apps/user_webdavauth/l10n/sv.php b/apps/user_webdavauth/l10n/sv.php
index b7a7e4ea2d9df2a462fef449dbac55d4e0286426..c79b35c27cdb434f7ac8a4712d00f08724e652fa 100644
--- a/apps/user_webdavauth/l10n/sv.php
+++ b/apps/user_webdavauth/l10n/sv.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"WebDAV Authentication" => "WebDAV Autentisering",
 "URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud kommer att skicka inloggningsuppgifterna till denna URL och tolkar http 401 och http 403 som fel och alla andra koder som korrekt."
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud kommer skicka anvÃ¤ndaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
 );
diff --git a/apps/user_webdavauth/l10n/th_TH.php b/apps/user_webdavauth/l10n/th_TH.php
index 9bd32954b058d9ad5c43d6604e9ba18e4bd559f3..2bd1f685e656ec448ccf68f15104ce547b4d0869 100644
--- a/apps/user_webdavauth/l10n/th_TH.php
+++ b/apps/user_webdavauth/l10n/th_TH.php
@@ -1,3 +1,5 @@
 <?php $TRANSLATIONS = array(
-"WebDAV URL: http://" => "WebDAV URL: http://"
+"WebDAV Authentication" => "WebDAV Authentication",
+"URL: http://" => "URL: http://",
+"ownCloud will send the user credentials to this URL. This plugin checks the response and will interpret the HTTP statuscodes 401 and 403 as invalid credentials, and all other responses as valid credentials." => "ownCloud à¸ˆà¸°à¸ªà¹ˆà¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸›à¸¢à¸±à¸‡à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆ URL à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸™à¸µà¹‰ à¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸µà¹ˆà¹‚à¸•à¹‰à¸•à¸à¸šà¸à¸¥à¸±à¸šà¸¡à¸²à¹à¸¥à¸°à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¹à¸›à¸¥à¸£à¸«à¸±à¸ª HTTP statuscodes 401 à¹à¸¥à¸° 403 à¹ƒà¸«à¹‰à¹€à¸›à¹‡à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰ à¸ªà¹ˆà¸§à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸·à¹ˆà¸™à¹†à¸—à¸µà¹ˆà¹€à¸«à¸¥à¸·à¸à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸ˆà¸°à¹€à¸›à¹‡à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
 );
diff --git a/apps/user_webdavauth/l10n/uk.php b/apps/user_webdavauth/l10n/uk.php
index 57aa90684ae33158dcd115f762ae3b5ad1f5b6a9..245a5101341d2a51e59b2cc0575b907f85eb3945 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"URL: http://" => "URL: http://",
-"ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct." => "ownCloud Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ– Ð½Ð° Ñ†ÐµÐ¹ URL Ñ‚Ð° Ð±ÑƒÐ´Ðµ Ñ–Ð½Ñ‚ÐµÑ€Ð¿Ñ€ÐµÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ http 401 Ñ– http 403, ÑÐº Ð½ÐµÐ²Ñ–Ñ€Ð½Ñ– Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ–, Ð° Ð²ÑÑ– Ñ–Ð½ÑˆÑ– ÐºÐ¾Ð´Ð¸, ÑÐº Ð²Ñ–Ñ€Ð½Ñ–."
+"URL: http://" => "URL: http://"
 );
diff --git a/apps/user_webdavauth/l10n/zh_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
index 5b06409b42e0d0c6983f2140160e2e0a08550984..72d2a0c11dff21a2b782198213f5deabbef34a66 100644
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ b/apps/user_webdavauth/l10n/zh_CN.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/templates/settings.php b/apps/user_webdavauth/templates/settings.php
index 62ed45fd278fa489a8b9acb95b2e5adb0d198a0f..880b77ac959182369b4afbd2cd51c5b57a28ece8 100755
--- a/apps/user_webdavauth/templates/settings.php
+++ b/apps/user_webdavauth/templates/settings.php
@@ -1,8 +1,8 @@
 <form id="webdavauth" action="#" method="post">
 	<fieldset class="personalblock">
-		<legend><strong>WebDAV Authentication</strong></legend>
+		<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="submit" value="Save" />
-		<br /><?php echo $l->t('ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct.'); ?>
+		<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.'); ?>
 	</fieldset>
 </form>
diff --git a/build/phpcs.xml b/build/phpcs.xml
index 1e10be1a11171f33252b3b01dabf5d7d723d5c11..d2909955ed2712adf8e133162f68d4f516846dbe 100644
--- a/build/phpcs.xml
+++ b/build/phpcs.xml
@@ -10,7 +10,7 @@
  <exclude-pattern>*/files_pdfviewer/js/pdfjs/*</exclude-pattern>
  <exclude-pattern>*/files_odfviewer/src/*</exclude-pattern>
  <exclude-pattern>*/files_svgedit/svg-edit/*</exclude-pattern>
- <exclude-pattern>*jquery-ui-1.8.16.custom.css</exclude-pattern>
+ <exclude-pattern>*jquery-ui-*.css</exclude-pattern>
  <extensions>php</extensions>
 
  <!-- Include the whole PEAR standard -->
diff --git a/config/config.sample.php b/config/config.sample.php
index b1655d028305c1f09672cf0128ac53749a7389ac..78d513c7f23d044f53de2245fafaab3f2cb7992a 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -1,5 +1,7 @@
 <?php
 
+/* Only enable this for local development and not in productive environments */
+/* This will disable the minifier and outputs some additional debug informations */
 define("DEBUG", true);
 
 $CONFIG = array(
@@ -36,12 +38,6 @@ $CONFIG = array(
 /* The automatic protocol detection of ownCloud can fail in certain reverse proxy situations. This option allows to manually override the protocol detection. For example "https" */
 "overwriteprotocol" => "",
 
-/* Enhanced auth forces users to enter their password again when performing potential sensitive actions like creating or deleting users */
-"enhancedauth" => true,
-
-/* Time in seconds how long an user is authenticated without entering his password again before performing sensitive actions like creating or deleting users etc...*/
-"enhancedauthtime" => 15 * 60,
-
 /* A proxy to use to connect to the internet. For example "myproxy.org:88" */
 "proxy" => "",
 
@@ -72,6 +68,9 @@ $CONFIG = array(
 /* URL of the appstore to use, server should understand OCS */
 "appstoreurl" => "http://api.apps.owncloud.com/v1",
 
+/* Enable SMTP class debugging */
+"mail_smtpdebug" => false,
+
 /* Mode to use for sending mail, can be sendmail, smtp, qmail or php, see PHPMailer docs */
 "mail_smtpmode" => "sendmail",
 
@@ -81,11 +80,22 @@ $CONFIG = array(
 /* Port to use for sending mail, depends on mail_smtpmode if this is used */
 "mail_smtpport" => 25,
 
+/* SMTP server timeout in seconds for sending mail, depends on mail_smtpmode if this is used */
+"mail_smtptimeout" => 10,
+
+/* SMTP connection prefix or sending mail, depends on mail_smtpmode if this is used.
+   Can be '', ssl or tls */
+"mail_smtpsecure" => "",
+
 /* authentication needed to send mail, depends on mail_smtpmode if this is used
  * (false = disable authentication)
  */
 "mail_smtpauth" => false,
 
+/* authentication type needed to send mail, depends on mail_smtpmode if this is used
+ * Can be LOGIN (default), PLAIN or NTLM */
+"mail_smtpauthtype" => "LOGIN",
+
 /* Username to use for sendmail mail, depends on mail_smtpauth if this is used */
 "mail_smtpname" => "",
 
@@ -110,6 +120,9 @@ $CONFIG = array(
 /* Lifetime of the remember login cookie, default is 15 days */
 "remember_login_cookie_lifetime" => 60*60*24*15,
 
+/* Custom CSP policy, changing this will overwrite the standard policy */
+"custom_csp_policy" => "default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *",
+
 /* 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.
  */
@@ -129,12 +142,12 @@ $CONFIG = array(
 		'path'=> '/var/www/owncloud/apps',
 		'url' => '/apps',
 		'writable' => true,
-  ),
- ),
- 'user_backends'=>array(
-    array(
-      'class'=>'OC_User_IMAP',
-      'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
-    )
-  )
+	),
+),
+'user_backends'=>array(
+	array(
+		'class'=>'OC_User_IMAP',
+		'arguments'=>array('{imap.gmail.com:993/imap/ssl}INBOX')
+	)
+)
 );
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 72ffc52e99749fc0c5720af8a27216e95648be78..6704a00c5a2c5345debf862a51715af80fbd58f1 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -72,6 +72,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 		case 'email':
 			// read post variables
 			$user = OCP\USER::getUser();
+			$displayName = OCP\User::getDisplayName();
 			$type = $_POST['itemType'];
 			$link = $_POST['link'];
 			$file = $_POST['file'];
@@ -81,13 +82,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			$l = OC_L10N::get('core');
 
 			// setup the email
-			$subject = (string)$l->t('User %s shared a file with you', $user);
+			$subject = (string)$l->t('User %s shared a file with you', $displayName);
 			if ($type === 'dir')
-				$subject = (string)$l->t('User %s shared a folder with you', $user);
+				$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($user, $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($user, $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');
@@ -98,7 +99,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
 				OCP\JSON::success();
 			} catch (Exception $exception) {
-				OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
+				OCP\JSON::error(array('data' => array('message' => OC_Util::sanitizeHTML($exception->getMessage()))));
 			}
 			break;
 	}
@@ -158,14 +159,14 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				while ($count < 4 && count($users) == $limit) {
 					$limit = 4 - $count;
 					if ($sharePolicy == 'groups_only') {
-						$users = OC_Group::usersInGroups($groups, $_GET['search'], $limit, $offset);
+						$users = OC_Group::DisplayNamesInGroups($groups, $_GET['search'], $limit, $offset);
 					} else {
-						$users = OC_User::getUsers($_GET['search'], $limit, $offset);
+						$users = OC_User::getDisplayNames($_GET['search'], $limit, $offset);
 					}
 					$offset += $limit;
-					foreach ($users as $user) {
-						if ((!isset($_GET['itemShares']) || !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_USER]) || !in_array($user, $_GET['itemShares'][OCP\Share::SHARE_TYPE_USER])) && $user != OC_User::getUser()) {
-							$shareWith[] = array('label' => $user, 'value' => array('shareType' => OCP\Share::SHARE_TYPE_USER, 'shareWith' => $user));
+					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));
 							$count++;
 						}
 					}
diff --git a/core/css/images/animated-overlay.gif b/core/css/images/animated-overlay.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d441f75ebfbdf26a265dfccd670120d25c0a341c
Binary files /dev/null and b/core/css/images/animated-overlay.gif differ
diff --git a/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..954e22dbd99e8c6dd7091335599abf2d10bf8003
Binary files /dev/null and b/core/css/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ
diff --git a/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png b/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png
new file mode 100644
index 0000000000000000000000000000000000000000..64ece5707d91a6edf9fad4bfcce0c4dbcafcf58d
Binary files /dev/null and b/core/css/images/ui-bg_diagonals-thick_20_666666_40x40.png differ
diff --git a/core/css/images/ui-bg_flat_100_ffffff_40x100.png b/core/css/images/ui-bg_flat_100_ffffff_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..ac8b229af950c29356abf64a6c4aa894575445f0
Binary files /dev/null and b/core/css/images/ui-bg_flat_100_ffffff_40x100.png differ
diff --git a/core/css/images/ui-bg_flat_10_000000_40x100.png b/core/css/images/ui-bg_flat_10_000000_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..abdc01082bf3534eafecc5819d28c9574d44ea89
Binary files /dev/null and b/core/css/images/ui-bg_flat_10_000000_40x100.png differ
diff --git a/core/css/images/ui-bg_flat_35_1d2d44_40x100.png b/core/css/images/ui-bg_flat_35_1d2d44_40x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..904ef14c37d9cff5afe71ef9733141328f22ac3c
Binary files /dev/null and b/core/css/images/ui-bg_flat_35_1d2d44_40x100.png differ
diff --git a/core/css/images/ui-bg_glass_100_f8f8f8_1x400.png b/core/css/images/ui-bg_glass_100_f8f8f8_1x400.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd79e9f1966df03e2956237b5a878a7c7cc32872
Binary files /dev/null and b/core/css/images/ui-bg_glass_100_f8f8f8_1x400.png differ
diff --git a/core/css/images/ui-bg_highlight-hard_100_f8f8f8_1x100.png b/core/css/images/ui-bg_highlight-hard_100_f8f8f8_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..268e650935da6ff0f4d975a3515c95b12ed4035e
Binary files /dev/null and b/core/css/images/ui-bg_highlight-hard_100_f8f8f8_1x100.png differ
diff --git a/core/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/core/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1273672d253263b7564e9e21d69d7d9d0b337d9
Binary files /dev/null and b/core/css/images/ui-bg_highlight-soft_100_eeeeee_1x100.png differ
diff --git a/core/css/images/ui-icons_1d2d44_256x240.png b/core/css/images/ui-icons_1d2d44_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a857e4da570dbcfedaecc67f4d1092ba321c0a2
Binary files /dev/null and b/core/css/images/ui-icons_1d2d44_256x240.png differ
diff --git a/core/css/images/ui-icons_222222_256x240.png b/core/css/images/ui-icons_222222_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..b273ff111d219c9b9a8b96d57683d0075fb7871a
Binary files /dev/null and b/core/css/images/ui-icons_222222_256x240.png differ
diff --git a/core/css/images/ui-icons_ffd27a_256x240.png b/core/css/images/ui-icons_ffd27a_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..e117effa3dca24e7978cfc5f8b967f661e81044f
Binary files /dev/null and b/core/css/images/ui-icons_ffd27a_256x240.png differ
diff --git a/core/css/images/ui-icons_ffffff_256x240.png b/core/css/images/ui-icons_ffffff_256x240.png
new file mode 100644
index 0000000000000000000000000000000000000000..42f8f992c727ddaa617da224a522e463df690387
Binary files /dev/null and b/core/css/images/ui-icons_ffffff_256x240.png differ
diff --git a/core/css/jquery-ui-1.10.0.custom.css b/core/css/jquery-ui-1.10.0.custom.css
new file mode 100644
index 0000000000000000000000000000000000000000..a1e9895c7766ddabe568c2b9236df66156c8572b
--- /dev/null
+++ b/core/css/jquery-ui-1.10.0.custom.css
@@ -0,0 +1,1174 @@
+/*! jQuery UI - v1.10.0 - 2013-01-22
+* http://jqueryui.com
+* Includes: jquery.ui.core.css, jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.accordion.css, jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css, jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css, jquery.ui.slider.css, jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css
+* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=%22Lucida%20Grande%22%2C%20Arial%2C%20Verdana%2C%20sans-serif&fwDefault=bold&fsDefault=1em&cornerRadius=4px&bgColorHeader=1d2d44&bgTextureHeader=01_flat.png&bgImgOpacityHeader=35&borderColorHeader=1d2d44&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f8f8f8&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=ddd&fcDefault=555&iconColorDefault=1d2d44&bgColorHover=ffffff&bgTextureHover=01_flat.png&bgImgOpacityHover=100&borderColorHover=ddd&fcHover=333&iconColorHover=1d2d44&bgColorActive=f8f8f8&bgTextureActive=02_glass.png&bgImgOpacityActive=100&borderColorActive=1d2d44&fcActive=1d2d44&iconColorActive=1d2d44&bgColorHighlight=f8f8f8&bgTextureHighlight=04_highlight_hard.png&bgImgOpacityHighlight=100&borderColorHighlight=ddd&fcHighlight=555&iconColorHighlight=ffffff&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
+* Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
+
+/* Layout helpers
+----------------------------------*/
+.ui-helper-hidden {
+	display: none;
+}
+.ui-helper-hidden-accessible {
+	border: 0;
+	clip: rect(0 0 0 0);
+	height: 1px;
+	margin: -1px;
+	overflow: hidden;
+	padding: 0;
+	position: absolute;
+	width: 1px;
+}
+.ui-helper-reset {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	line-height: 1.3;
+	text-decoration: none;
+	font-size: 100%;
+	list-style: none;
+}
+.ui-helper-clearfix:before,
+.ui-helper-clearfix:after {
+	content: "";
+	display: table;
+}
+.ui-helper-clearfix:after {
+	clear: both;
+}
+.ui-helper-clearfix {
+	min-height: 0; /* support: IE7 */
+}
+.ui-helper-zfix {
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	position: absolute;
+	opacity: 0;
+	filter:Alpha(Opacity=0);
+}
+
+.ui-front {
+	z-index: 100;
+}
+
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-disabled {
+	cursor: default !important;
+}
+
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	display: block;
+	text-indent: -99999px;
+	overflow: hidden;
+	background-repeat: no-repeat;
+}
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Overlays */
+.ui-widget-overlay {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+}
+.ui-resizable {
+	position: relative;
+}
+.ui-resizable-handle {
+	position: absolute;
+	font-size: 0.1px;
+	display: block;
+}
+.ui-resizable-disabled .ui-resizable-handle,
+.ui-resizable-autohide .ui-resizable-handle {
+	display: none;
+}
+.ui-resizable-n {
+	cursor: n-resize;
+	height: 7px;
+	width: 100%;
+	top: -5px;
+	left: 0;
+}
+.ui-resizable-s {
+	cursor: s-resize;
+	height: 7px;
+	width: 100%;
+	bottom: -5px;
+	left: 0;
+}
+.ui-resizable-e {
+	cursor: e-resize;
+	width: 7px;
+	right: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-w {
+	cursor: w-resize;
+	width: 7px;
+	left: -5px;
+	top: 0;
+	height: 100%;
+}
+.ui-resizable-se {
+	cursor: se-resize;
+	width: 12px;
+	height: 12px;
+	right: 1px;
+	bottom: 1px;
+}
+.ui-resizable-sw {
+	cursor: sw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	bottom: -5px;
+}
+.ui-resizable-nw {
+	cursor: nw-resize;
+	width: 9px;
+	height: 9px;
+	left: -5px;
+	top: -5px;
+}
+.ui-resizable-ne {
+	cursor: ne-resize;
+	width: 9px;
+	height: 9px;
+	right: -5px;
+	top: -5px;
+}
+.ui-selectable-helper {
+	position: absolute;
+	z-index: 100;
+	border: 1px dotted black;
+}
+.ui-accordion .ui-accordion-header {
+	display: block;
+	cursor: pointer;
+	position: relative;
+	margin-top: 2px;
+	padding: .5em .5em .5em .7em;
+	min-height: 0; /* support: IE7 */
+}
+.ui-accordion .ui-accordion-icons {
+	padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-noicons {
+	padding-left: .7em;
+}
+.ui-accordion .ui-accordion-icons .ui-accordion-icons {
+	padding-left: 2.2em;
+}
+.ui-accordion .ui-accordion-header .ui-accordion-header-icon {
+	position: absolute;
+	left: .5em;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-accordion .ui-accordion-content {
+	padding: 1em 2.2em;
+	border-top: 0;
+	overflow: auto;
+}
+.ui-autocomplete {
+	position: absolute;
+	top: 0;
+	left: 0;
+	cursor: default;
+}
+.ui-button {
+	display: inline-block;
+	position: relative;
+	padding: 0;
+	line-height: normal;
+	margin-right: .1em;
+	cursor: pointer;
+	vertical-align: middle;
+	text-align: center;
+	overflow: visible; /* removes extra width in IE */
+}
+.ui-button,
+.ui-button:link,
+.ui-button:visited,
+.ui-button:hover,
+.ui-button:active {
+	text-decoration: none;
+}
+/* to make room for the icon, a width needs to be set here */
+.ui-button-icon-only {
+	width: 2.2em;
+}
+/* button elements seem to need a little more width */
+button.ui-button-icon-only {
+	width: 2.4em;
+}
+.ui-button-icons-only {
+	width: 3.4em;
+}
+button.ui-button-icons-only {
+	width: 3.7em;
+}
+
+/* button text element */
+.ui-button .ui-button-text {
+	display: block;
+	line-height: normal;
+}
+.ui-button-text-only .ui-button-text {
+	padding: .4em 1em;
+}
+.ui-button-icon-only .ui-button-text,
+.ui-button-icons-only .ui-button-text {
+	padding: .4em;
+	text-indent: -9999999px;
+}
+.ui-button-text-icon-primary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+	padding: .4em 1em .4em 2.1em;
+}
+.ui-button-text-icon-secondary .ui-button-text,
+.ui-button-text-icons .ui-button-text {
+	padding: .4em 2.1em .4em 1em;
+}
+.ui-button-text-icons .ui-button-text {
+	padding-left: 2.1em;
+	padding-right: 2.1em;
+}
+/* no icon support for input elements, provide padding by default */
+input.ui-button {
+	padding: .4em 1em;
+}
+
+/* button icon element(s) */
+.ui-button-icon-only .ui-icon,
+.ui-button-text-icon-primary .ui-icon,
+.ui-button-text-icon-secondary .ui-icon,
+.ui-button-text-icons .ui-icon,
+.ui-button-icons-only .ui-icon {
+	position: absolute;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-button-icon-only .ui-icon {
+	left: 50%;
+	margin-left: -8px;
+}
+.ui-button-text-icon-primary .ui-button-icon-primary,
+.ui-button-text-icons .ui-button-icon-primary,
+.ui-button-icons-only .ui-button-icon-primary {
+	left: .5em;
+}
+.ui-button-text-icon-secondary .ui-button-icon-secondary,
+.ui-button-text-icons .ui-button-icon-secondary,
+.ui-button-icons-only .ui-button-icon-secondary {
+	right: .5em;
+}
+
+/* button sets */
+.ui-buttonset {
+	margin-right: 7px;
+}
+.ui-buttonset .ui-button {
+	margin-left: 0;
+	margin-right: -.3em;
+}
+
+/* workarounds */
+/* reset extra padding in Firefox, see h5bp.com/l */
+input.ui-button::-moz-focus-inner,
+button.ui-button::-moz-focus-inner {
+	border: 0;
+	padding: 0;
+}
+.ui-datepicker {
+	width: 17em;
+	padding: .2em .2em 0;
+	display: none;
+}
+.ui-datepicker .ui-datepicker-header {
+	position: relative;
+	padding: .2em 0;
+}
+.ui-datepicker .ui-datepicker-prev,
+.ui-datepicker .ui-datepicker-next {
+	position: absolute;
+	top: 2px;
+	width: 1.8em;
+	height: 1.8em;
+}
+.ui-datepicker .ui-datepicker-prev-hover,
+.ui-datepicker .ui-datepicker-next-hover {
+	top: 1px;
+}
+.ui-datepicker .ui-datepicker-prev {
+	left: 2px;
+}
+.ui-datepicker .ui-datepicker-next {
+	right: 2px;
+}
+.ui-datepicker .ui-datepicker-prev-hover {
+	left: 1px;
+}
+.ui-datepicker .ui-datepicker-next-hover {
+	right: 1px;
+}
+.ui-datepicker .ui-datepicker-prev span,
+.ui-datepicker .ui-datepicker-next span {
+	display: block;
+	position: absolute;
+	left: 50%;
+	margin-left: -8px;
+	top: 50%;
+	margin-top: -8px;
+}
+.ui-datepicker .ui-datepicker-title {
+	margin: 0 2.3em;
+	line-height: 1.8em;
+	text-align: center;
+}
+.ui-datepicker .ui-datepicker-title select {
+	font-size: 1em;
+	margin: 1px 0;
+}
+.ui-datepicker select.ui-datepicker-month-year {
+	width: 100%;
+}
+.ui-datepicker select.ui-datepicker-month,
+.ui-datepicker select.ui-datepicker-year {
+	width: 49%;
+}
+.ui-datepicker table {
+	width: 100%;
+	font-size: .9em;
+	border-collapse: collapse;
+	margin: 0 0 .4em;
+}
+.ui-datepicker th {
+	padding: .7em .3em;
+	text-align: center;
+	font-weight: bold;
+	border: 0;
+}
+.ui-datepicker td {
+	border: 0;
+	padding: 1px;
+}
+.ui-datepicker td span,
+.ui-datepicker td a {
+	display: block;
+	padding: .2em;
+	text-align: right;
+	text-decoration: none;
+}
+.ui-datepicker .ui-datepicker-buttonpane {
+	background-image: none;
+	margin: .7em 0 0 0;
+	padding: 0 .2em;
+	border-left: 0;
+	border-right: 0;
+	border-bottom: 0;
+}
+.ui-datepicker .ui-datepicker-buttonpane button {
+	float: right;
+	margin: .5em .2em .4em;
+	cursor: pointer;
+	padding: .2em .6em .3em .6em;
+	width: auto;
+	overflow: visible;
+}
+.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
+	float: left;
+}
+
+/* with multiple calendars */
+.ui-datepicker.ui-datepicker-multi {
+	width: auto;
+}
+.ui-datepicker-multi .ui-datepicker-group {
+	float: left;
+}
+.ui-datepicker-multi .ui-datepicker-group table {
+	width: 95%;
+	margin: 0 auto .4em;
+}
+.ui-datepicker-multi-2 .ui-datepicker-group {
+	width: 50%;
+}
+.ui-datepicker-multi-3 .ui-datepicker-group {
+	width: 33.3%;
+}
+.ui-datepicker-multi-4 .ui-datepicker-group {
+	width: 25%;
+}
+.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
+	border-left-width: 0;
+}
+.ui-datepicker-multi .ui-datepicker-buttonpane {
+	clear: left;
+}
+.ui-datepicker-row-break {
+	clear: both;
+	width: 100%;
+	font-size: 0;
+}
+
+/* RTL support */
+.ui-datepicker-rtl {
+	direction: rtl;
+}
+.ui-datepicker-rtl .ui-datepicker-prev {
+	right: 2px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next {
+	left: 2px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-prev:hover {
+	right: 1px;
+	left: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-next:hover {
+	left: 1px;
+	right: auto;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane {
+	clear: right;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button {
+	float: left;
+}
+.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
+.ui-datepicker-rtl .ui-datepicker-group {
+	float: right;
+}
+.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
+.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
+	border-right-width: 0;
+	border-left-width: 1px;
+}
+.ui-dialog {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: .2em;
+	outline: 0;
+}
+.ui-dialog .ui-dialog-titlebar {
+	padding: .4em 1em;
+	position: relative;
+}
+.ui-dialog .ui-dialog-title {
+	float: left;
+	margin: .1em 0;
+	white-space: nowrap;
+	width: 90%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+.ui-dialog .ui-dialog-titlebar-close {
+	position: absolute;
+	right: .3em;
+	top: 50%;
+	width: 21px;
+	margin: -10px 0 0 0;
+	padding: 1px;
+	height: 20px;
+}
+.ui-dialog .ui-dialog-content {
+	position: relative;
+	border: 0;
+	padding: .5em 1em;
+	background: none;
+	overflow: auto;
+}
+.ui-dialog .ui-dialog-buttonpane {
+	text-align: left;
+	border-width: 1px 0 0 0;
+	background-image: none;
+	margin-top: .5em;
+	padding: .3em 1em .5em .4em;
+}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
+	float: right;
+}
+.ui-dialog .ui-dialog-buttonpane button {
+	margin: .5em .4em .5em 0;
+	cursor: pointer;
+}
+.ui-dialog .ui-resizable-se {
+	width: 12px;
+	height: 12px;
+	right: -5px;
+	bottom: -5px;
+	background-position: 16px 16px;
+}
+.ui-draggable .ui-dialog-titlebar {
+	cursor: move;
+}
+.ui-menu {
+	list-style: none;
+	padding: 2px;
+	margin: 0;
+	display: block;
+	outline: none;
+}
+.ui-menu .ui-menu {
+	margin-top: -3px;
+	position: absolute;
+}
+.ui-menu .ui-menu-item {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}
+.ui-menu .ui-menu-divider {
+	margin: 5px -2px 5px -2px;
+	height: 0;
+	font-size: 0;
+	line-height: 0;
+	border-width: 1px 0 0 0;
+}
+.ui-menu .ui-menu-item a {
+	text-decoration: none;
+	display: block;
+	padding: 2px .4em;
+	line-height: 1.5;
+	min-height: 0; /* support: IE7 */
+	font-weight: normal;
+}
+.ui-menu .ui-menu-item a.ui-state-focus,
+.ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
+	margin: -1px;
+}
+
+.ui-menu .ui-state-disabled {
+	font-weight: normal;
+	margin: .4em 0 .2em;
+	line-height: 1.5;
+}
+.ui-menu .ui-state-disabled a {
+	cursor: default;
+}
+
+/* icon support */
+.ui-menu-icons {
+	position: relative;
+}
+.ui-menu-icons .ui-menu-item a {
+	position: relative;
+	padding-left: 2em;
+}
+
+/* left-aligned */
+.ui-menu .ui-icon {
+	position: absolute;
+	top: .2em;
+	left: .2em;
+}
+
+/* right-aligned */
+.ui-menu .ui-menu-icon {
+	position: static;
+	float: right;
+}
+.ui-progressbar {
+	height: 2em;
+	text-align: left;
+	overflow: hidden;
+}
+.ui-progressbar .ui-progressbar-value {
+	margin: -1px;
+	height: 100%;
+}
+.ui-progressbar .ui-progressbar-overlay {
+	background: url("images/animated-overlay.gif");
+	height: 100%;
+	filter: alpha(opacity=25);
+	opacity: 0.25;
+}
+.ui-progressbar-indeterminate .ui-progressbar-value {
+	background-image: none;
+}
+.ui-slider {
+	position: relative;
+	text-align: left;
+}
+.ui-slider .ui-slider-handle {
+	position: absolute;
+	z-index: 2;
+	width: 1.2em;
+	height: 1.2em;
+	cursor: default;
+}
+.ui-slider .ui-slider-range {
+	position: absolute;
+	z-index: 1;
+	font-size: .7em;
+	display: block;
+	border: 0;
+	background-position: 0 0;
+}
+
+/* For IE8 - See #6727 */
+.ui-slider.ui-state-disabled .ui-slider-handle,
+.ui-slider.ui-state-disabled .ui-slider-range {
+	filter: inherit;
+}
+
+.ui-slider-horizontal {
+	height: .8em;
+}
+.ui-slider-horizontal .ui-slider-handle {
+	top: -.3em;
+	margin-left: -.6em;
+}
+.ui-slider-horizontal .ui-slider-range {
+	top: 0;
+	height: 100%;
+}
+.ui-slider-horizontal .ui-slider-range-min {
+	left: 0;
+}
+.ui-slider-horizontal .ui-slider-range-max {
+	right: 0;
+}
+
+.ui-slider-vertical {
+	width: .8em;
+	height: 100px;
+}
+.ui-slider-vertical .ui-slider-handle {
+	left: -.3em;
+	margin-left: 0;
+	margin-bottom: -.6em;
+}
+.ui-slider-vertical .ui-slider-range {
+	left: 0;
+	width: 100%;
+}
+.ui-slider-vertical .ui-slider-range-min {
+	bottom: 0;
+}
+.ui-slider-vertical .ui-slider-range-max {
+	top: 0;
+}
+.ui-spinner {
+	position: relative;
+	display: inline-block;
+	overflow: hidden;
+	padding: 0;
+	vertical-align: middle;
+}
+.ui-spinner-input {
+	border: none;
+	background: none;
+	color: inherit;
+	padding: 0;
+	margin: .2em 0;
+	vertical-align: middle;
+	margin-left: .4em;
+	margin-right: 22px;
+}
+.ui-spinner-button {
+	width: 16px;
+	height: 50%;
+	font-size: .5em;
+	padding: 0;
+	margin: 0;
+	text-align: center;
+	position: absolute;
+	cursor: default;
+	display: block;
+	overflow: hidden;
+	right: 0;
+}
+/* more specificity required here to overide default borders */
+.ui-spinner a.ui-spinner-button {
+	border-top: none;
+	border-bottom: none;
+	border-right: none;
+}
+/* vertical centre icon */
+.ui-spinner .ui-icon {
+	position: absolute;
+	margin-top: -8px;
+	top: 50%;
+	left: 0;
+}
+.ui-spinner-up {
+	top: 0;
+}
+.ui-spinner-down {
+	bottom: 0;
+}
+
+/* TR overrides */
+.ui-spinner .ui-icon-triangle-1-s {
+	/* need to fix icons sprite */
+	background-position: -65px -16px;
+}
+.ui-tabs {
+	position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
+	padding: .2em;
+}
+.ui-tabs .ui-tabs-nav {
+	margin: 0;
+	padding: .2em .2em 0;
+}
+.ui-tabs .ui-tabs-nav li {
+	list-style: none;
+	float: left;
+	position: relative;
+	top: 0;
+	margin: 1px .2em 0 0;
+	border-bottom: 0;
+	padding: 0;
+	white-space: nowrap;
+}
+.ui-tabs .ui-tabs-nav li a {
+	float: left;
+	padding: .5em 1em;
+	text-decoration: none;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active {
+	margin-bottom: -1px;
+	padding-bottom: 1px;
+}
+.ui-tabs .ui-tabs-nav li.ui-tabs-active a,
+.ui-tabs .ui-tabs-nav li.ui-state-disabled a,
+.ui-tabs .ui-tabs-nav li.ui-tabs-loading a {
+	cursor: text;
+}
+.ui-tabs .ui-tabs-nav li a, /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
+.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a {
+	cursor: pointer;
+}
+.ui-tabs .ui-tabs-panel {
+	display: block;
+	border-width: 0;
+	padding: 1em 1.4em;
+	background: none;
+}
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: 300px;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	box-shadow: 0 0 5px #aaa;
+}
+body .ui-tooltip {
+	border-width: 2px;
+}
+
+/* Component containers
+----------------------------------*/
+.ui-widget {
+	font-family: "Lucida Grande", Arial, Verdana, sans-serif;
+	font-size: 1em;
+}
+.ui-widget .ui-widget {
+	font-size: 1em;
+}
+.ui-widget input,
+.ui-widget select,
+.ui-widget textarea,
+.ui-widget button {
+	font-family: "Lucida Grande", Arial, Verdana, sans-serif;
+	font-size: 1em;
+}
+.ui-widget-content {
+	border: 1px solid #dddddd;
+	background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x;
+	color: #333333;
+}
+.ui-widget-content a {
+	color: #333333;
+}
+.ui-widget-header {
+	border: 1px solid #1d2d44;
+	background: #1d2d44 url(images/ui-bg_flat_35_1d2d44_40x100.png) 50% 50% repeat-x;
+	color: #ffffff;
+	font-weight: bold;
+}
+.ui-widget-header a {
+	color: #ffffff;
+}
+
+/* Interaction states
+----------------------------------*/
+.ui-state-default,
+.ui-widget-content .ui-state-default,
+.ui-widget-header .ui-state-default {
+	border: 1px solid #ddd;
+	background: #f8f8f8 url(images/ui-bg_glass_100_f8f8f8_1x400.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #555;
+}
+.ui-state-default a,
+.ui-state-default a:link,
+.ui-state-default a:visited {
+	color: #555;
+	text-decoration: none;
+}
+.ui-state-hover,
+.ui-widget-content .ui-state-hover,
+.ui-widget-header .ui-state-hover,
+.ui-state-focus,
+.ui-widget-content .ui-state-focus,
+.ui-widget-header .ui-state-focus {
+	border: 1px solid #ddd;
+	background: #ffffff url(images/ui-bg_flat_100_ffffff_40x100.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #333;
+}
+.ui-state-hover a,
+.ui-state-hover a:hover,
+.ui-state-hover a:link,
+.ui-state-hover a:visited {
+	color: #333;
+	text-decoration: none;
+}
+.ui-state-active,
+.ui-widget-content .ui-state-active,
+.ui-widget-header .ui-state-active {
+	border: 1px solid #1d2d44;
+	background: #f8f8f8 url(images/ui-bg_glass_100_f8f8f8_1x400.png) 50% 50% repeat-x;
+	font-weight: bold;
+	color: #1d2d44;
+}
+.ui-state-active a,
+.ui-state-active a:link,
+.ui-state-active a:visited {
+	color: #1d2d44;
+	text-decoration: none;
+}
+
+/* Interaction Cues
+----------------------------------*/
+.ui-state-highlight,
+.ui-widget-content .ui-state-highlight,
+.ui-widget-header .ui-state-highlight {
+	border: 1px solid #ddd;
+	background: #f8f8f8 url(images/ui-bg_highlight-hard_100_f8f8f8_1x100.png) 50% top repeat-x;
+	color: #555;
+}
+.ui-state-highlight a,
+.ui-widget-content .ui-state-highlight a,
+.ui-widget-header .ui-state-highlight a {
+	color: #555;
+}
+.ui-state-error,
+.ui-widget-content .ui-state-error,
+.ui-widget-header .ui-state-error {
+	border: 1px solid #cd0a0a;
+	background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat;
+	color: #ffffff;
+}
+.ui-state-error a,
+.ui-widget-content .ui-state-error a,
+.ui-widget-header .ui-state-error a {
+	color: #ffffff;
+}
+.ui-state-error-text,
+.ui-widget-content .ui-state-error-text,
+.ui-widget-header .ui-state-error-text {
+	color: #ffffff;
+}
+.ui-priority-primary,
+.ui-widget-content .ui-priority-primary,
+.ui-widget-header .ui-priority-primary {
+	font-weight: bold;
+}
+.ui-priority-secondary,
+.ui-widget-content .ui-priority-secondary,
+.ui-widget-header .ui-priority-secondary {
+	opacity: .7;
+	filter:Alpha(Opacity=70);
+	font-weight: normal;
+}
+.ui-state-disabled,
+.ui-widget-content .ui-state-disabled,
+.ui-widget-header .ui-state-disabled {
+	opacity: .35;
+	filter:Alpha(Opacity=35);
+	background-image: none;
+}
+.ui-state-disabled .ui-icon {
+	filter:Alpha(Opacity=35); /* For IE8 - See #6059 */
+}
+
+/* Icons
+----------------------------------*/
+
+/* states and images */
+.ui-icon {
+	width: 16px;
+	height: 16px;
+	background-position: 16px 16px;
+}
+.ui-icon,
+.ui-widget-content .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-widget-header .ui-icon {
+	background-image: url(images/ui-icons_222222_256x240.png);
+}
+.ui-state-default .ui-icon {
+	background-image: url(images/ui-icons_1d2d44_256x240.png);
+}
+.ui-state-hover .ui-icon,
+.ui-state-focus .ui-icon {
+	background-image: url(images/ui-icons_1d2d44_256x240.png);
+}
+.ui-state-active .ui-icon {
+	background-image: url(images/ui-icons_1d2d44_256x240.png);
+}
+.ui-state-highlight .ui-icon {
+	background-image: url(images/ui-icons_ffffff_256x240.png);
+}
+.ui-state-error .ui-icon,
+.ui-state-error-text .ui-icon {
+	background-image: url(images/ui-icons_ffd27a_256x240.png);
+}
+
+/* positioning */
+.ui-icon-carat-1-n { background-position: 0 0; }
+.ui-icon-carat-1-ne { background-position: -16px 0; }
+.ui-icon-carat-1-e { background-position: -32px 0; }
+.ui-icon-carat-1-se { background-position: -48px 0; }
+.ui-icon-carat-1-s { background-position: -64px 0; }
+.ui-icon-carat-1-sw { background-position: -80px 0; }
+.ui-icon-carat-1-w { background-position: -96px 0; }
+.ui-icon-carat-1-nw { background-position: -112px 0; }
+.ui-icon-carat-2-n-s { background-position: -128px 0; }
+.ui-icon-carat-2-e-w { background-position: -144px 0; }
+.ui-icon-triangle-1-n { background-position: 0 -16px; }
+.ui-icon-triangle-1-ne { background-position: -16px -16px; }
+.ui-icon-triangle-1-e { background-position: -32px -16px; }
+.ui-icon-triangle-1-se { background-position: -48px -16px; }
+.ui-icon-triangle-1-s { background-position: -64px -16px; }
+.ui-icon-triangle-1-sw { background-position: -80px -16px; }
+.ui-icon-triangle-1-w { background-position: -96px -16px; }
+.ui-icon-triangle-1-nw { background-position: -112px -16px; }
+.ui-icon-triangle-2-n-s { background-position: -128px -16px; }
+.ui-icon-triangle-2-e-w { background-position: -144px -16px; }
+.ui-icon-arrow-1-n { background-position: 0 -32px; }
+.ui-icon-arrow-1-ne { background-position: -16px -32px; }
+.ui-icon-arrow-1-e { background-position: -32px -32px; }
+.ui-icon-arrow-1-se { background-position: -48px -32px; }
+.ui-icon-arrow-1-s { background-position: -64px -32px; }
+.ui-icon-arrow-1-sw { background-position: -80px -32px; }
+.ui-icon-arrow-1-w { background-position: -96px -32px; }
+.ui-icon-arrow-1-nw { background-position: -112px -32px; }
+.ui-icon-arrow-2-n-s { background-position: -128px -32px; }
+.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; }
+.ui-icon-arrow-2-e-w { background-position: -160px -32px; }
+.ui-icon-arrow-2-se-nw { background-position: -176px -32px; }
+.ui-icon-arrowstop-1-n { background-position: -192px -32px; }
+.ui-icon-arrowstop-1-e { background-position: -208px -32px; }
+.ui-icon-arrowstop-1-s { background-position: -224px -32px; }
+.ui-icon-arrowstop-1-w { background-position: -240px -32px; }
+.ui-icon-arrowthick-1-n { background-position: 0 -48px; }
+.ui-icon-arrowthick-1-ne { background-position: -16px -48px; }
+.ui-icon-arrowthick-1-e { background-position: -32px -48px; }
+.ui-icon-arrowthick-1-se { background-position: -48px -48px; }
+.ui-icon-arrowthick-1-s { background-position: -64px -48px; }
+.ui-icon-arrowthick-1-sw { background-position: -80px -48px; }
+.ui-icon-arrowthick-1-w { background-position: -96px -48px; }
+.ui-icon-arrowthick-1-nw { background-position: -112px -48px; }
+.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; }
+.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; }
+.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; }
+.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; }
+.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; }
+.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; }
+.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; }
+.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; }
+.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; }
+.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; }
+.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; }
+.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; }
+.ui-icon-arrowreturn-1-w { background-position: -64px -64px; }
+.ui-icon-arrowreturn-1-n { background-position: -80px -64px; }
+.ui-icon-arrowreturn-1-e { background-position: -96px -64px; }
+.ui-icon-arrowreturn-1-s { background-position: -112px -64px; }
+.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; }
+.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; }
+.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; }
+.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; }
+.ui-icon-arrow-4 { background-position: 0 -80px; }
+.ui-icon-arrow-4-diag { background-position: -16px -80px; }
+.ui-icon-extlink { background-position: -32px -80px; }
+.ui-icon-newwin { background-position: -48px -80px; }
+.ui-icon-refresh { background-position: -64px -80px; }
+.ui-icon-shuffle { background-position: -80px -80px; }
+.ui-icon-transfer-e-w { background-position: -96px -80px; }
+.ui-icon-transferthick-e-w { background-position: -112px -80px; }
+.ui-icon-folder-collapsed { background-position: 0 -96px; }
+.ui-icon-folder-open { background-position: -16px -96px; }
+.ui-icon-document { background-position: -32px -96px; }
+.ui-icon-document-b { background-position: -48px -96px; }
+.ui-icon-note { background-position: -64px -96px; }
+.ui-icon-mail-closed { background-position: -80px -96px; }
+.ui-icon-mail-open { background-position: -96px -96px; }
+.ui-icon-suitcase { background-position: -112px -96px; }
+.ui-icon-comment { background-position: -128px -96px; }
+.ui-icon-person { background-position: -144px -96px; }
+.ui-icon-print { background-position: -160px -96px; }
+.ui-icon-trash { background-position: -176px -96px; }
+.ui-icon-locked { background-position: -192px -96px; }
+.ui-icon-unlocked { background-position: -208px -96px; }
+.ui-icon-bookmark { background-position: -224px -96px; }
+.ui-icon-tag { background-position: -240px -96px; }
+.ui-icon-home { background-position: 0 -112px; }
+.ui-icon-flag { background-position: -16px -112px; }
+.ui-icon-calendar { background-position: -32px -112px; }
+.ui-icon-cart { background-position: -48px -112px; }
+.ui-icon-pencil { background-position: -64px -112px; }
+.ui-icon-clock { background-position: -80px -112px; }
+.ui-icon-disk { background-position: -96px -112px; }
+.ui-icon-calculator { background-position: -112px -112px; }
+.ui-icon-zoomin { background-position: -128px -112px; }
+.ui-icon-zoomout { background-position: -144px -112px; }
+.ui-icon-search { background-position: -160px -112px; }
+.ui-icon-wrench { background-position: -176px -112px; }
+.ui-icon-gear { background-position: -192px -112px; }
+.ui-icon-heart { background-position: -208px -112px; }
+.ui-icon-star { background-position: -224px -112px; }
+.ui-icon-link { background-position: -240px -112px; }
+.ui-icon-cancel { background-position: 0 -128px; }
+.ui-icon-plus { background-position: -16px -128px; }
+.ui-icon-plusthick { background-position: -32px -128px; }
+.ui-icon-minus { background-position: -48px -128px; }
+.ui-icon-minusthick { background-position: -64px -128px; }
+.ui-icon-close { background-position: -80px -128px; }
+.ui-icon-closethick { background-position: -96px -128px; }
+.ui-icon-key { background-position: -112px -128px; }
+.ui-icon-lightbulb { background-position: -128px -128px; }
+.ui-icon-scissors { background-position: -144px -128px; }
+.ui-icon-clipboard { background-position: -160px -128px; }
+.ui-icon-copy { background-position: -176px -128px; }
+.ui-icon-contact { background-position: -192px -128px; }
+.ui-icon-image { background-position: -208px -128px; }
+.ui-icon-video { background-position: -224px -128px; }
+.ui-icon-script { background-position: -240px -128px; }
+.ui-icon-alert { background-position: 0 -144px; }
+.ui-icon-info { background-position: -16px -144px; }
+.ui-icon-notice { background-position: -32px -144px; }
+.ui-icon-help { background-position: -48px -144px; }
+.ui-icon-check { background-position: -64px -144px; }
+.ui-icon-bullet { background-position: -80px -144px; }
+.ui-icon-radio-on { background-position: -96px -144px; }
+.ui-icon-radio-off { background-position: -112px -144px; }
+.ui-icon-pin-w { background-position: -128px -144px; }
+.ui-icon-pin-s { background-position: -144px -144px; }
+.ui-icon-play { background-position: 0 -160px; }
+.ui-icon-pause { background-position: -16px -160px; }
+.ui-icon-seek-next { background-position: -32px -160px; }
+.ui-icon-seek-prev { background-position: -48px -160px; }
+.ui-icon-seek-end { background-position: -64px -160px; }
+.ui-icon-seek-start { background-position: -80px -160px; }
+/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */
+.ui-icon-seek-first { background-position: -80px -160px; }
+.ui-icon-stop { background-position: -96px -160px; }
+.ui-icon-eject { background-position: -112px -160px; }
+.ui-icon-volume-off { background-position: -128px -160px; }
+.ui-icon-volume-on { background-position: -144px -160px; }
+.ui-icon-power { background-position: 0 -176px; }
+.ui-icon-signal-diag { background-position: -16px -176px; }
+.ui-icon-signal { background-position: -32px -176px; }
+.ui-icon-battery-0 { background-position: -48px -176px; }
+.ui-icon-battery-1 { background-position: -64px -176px; }
+.ui-icon-battery-2 { background-position: -80px -176px; }
+.ui-icon-battery-3 { background-position: -96px -176px; }
+.ui-icon-circle-plus { background-position: 0 -192px; }
+.ui-icon-circle-minus { background-position: -16px -192px; }
+.ui-icon-circle-close { background-position: -32px -192px; }
+.ui-icon-circle-triangle-e { background-position: -48px -192px; }
+.ui-icon-circle-triangle-s { background-position: -64px -192px; }
+.ui-icon-circle-triangle-w { background-position: -80px -192px; }
+.ui-icon-circle-triangle-n { background-position: -96px -192px; }
+.ui-icon-circle-arrow-e { background-position: -112px -192px; }
+.ui-icon-circle-arrow-s { background-position: -128px -192px; }
+.ui-icon-circle-arrow-w { background-position: -144px -192px; }
+.ui-icon-circle-arrow-n { background-position: -160px -192px; }
+.ui-icon-circle-zoomin { background-position: -176px -192px; }
+.ui-icon-circle-zoomout { background-position: -192px -192px; }
+.ui-icon-circle-check { background-position: -208px -192px; }
+.ui-icon-circlesmall-plus { background-position: 0 -208px; }
+.ui-icon-circlesmall-minus { background-position: -16px -208px; }
+.ui-icon-circlesmall-close { background-position: -32px -208px; }
+.ui-icon-squaresmall-plus { background-position: -48px -208px; }
+.ui-icon-squaresmall-minus { background-position: -64px -208px; }
+.ui-icon-squaresmall-close { background-position: -80px -208px; }
+.ui-icon-grip-dotted-vertical { background-position: 0 -224px; }
+.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; }
+.ui-icon-grip-solid-vertical { background-position: -32px -224px; }
+.ui-icon-grip-solid-horizontal { background-position: -48px -224px; }
+.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; }
+.ui-icon-grip-diagonal-se { background-position: -80px -224px; }
+
+
+/* Misc visuals
+----------------------------------*/
+
+/* Corner radius */
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-left,
+.ui-corner-tl {
+	border-top-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-top,
+.ui-corner-right,
+.ui-corner-tr {
+	border-top-right-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-left,
+.ui-corner-bl {
+	border-bottom-left-radius: 4px;
+}
+.ui-corner-all,
+.ui-corner-bottom,
+.ui-corner-right,
+.ui-corner-br {
+	border-bottom-right-radius: 4px;
+}
+
+/* Overlays */
+.ui-widget-overlay {
+	background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat;
+	opacity: .5;
+	filter: Alpha(Opacity=50);
+}
+.ui-widget-shadow {
+	margin: -5px 0 0 -5px;
+	padding: 5px;
+	background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x;
+	opacity: .2;
+	filter: Alpha(Opacity=20);
+	border-radius: 5px;
+}
diff --git a/core/css/jquery-ui-1.8.16.custom.css b/core/css/jquery-ui-1.8.16.custom.css
deleted file mode 100644
index add1c6af08c2395028d51cb99bfa8180c7f09c34..0000000000000000000000000000000000000000
--- a/core/css/jquery-ui-1.8.16.custom.css
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * jQuery UI CSS Framework 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- */
-
-/* Layout helpers
-----------------------------------*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
-.ui-helper-clearfix { display: inline-block; }
-/* required comment for clearfix to work in Opera \*/
-* html .ui-helper-clearfix { height:1%; }
-.ui-helper-clearfix { display:block; }
-/* end clearfix */
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
-----------------------------------*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
-
-
-/*
- * jQuery UI CSS Framework 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Theming/API
- *
- * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault="Lucida%20Grande",%20Arial,%20Verdana,%20sans-serif&fwDefault=bold&fsDefault=1em&cornerRadius=4px&bgColorHeader=1d2d44&bgTextureHeader=01_flat.png&bgImgOpacityHeader=35&borderColorHeader=1d2d44&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f8f8f8&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=ddd&fcDefault=555&iconColorDefault=1d2d44&bgColorHover=ffffff&bgTextureHover=01_flat.png&bgImgOpacityHover=100&borderColorHover=ddd&fcHover=333&iconColorHover=1d2d44&bgColorActive=f8f8f8&bgTextureActive=02_glass.png&bgImgOpacityActive=100&borderColorActive=1d2d44&fcActive=1d2d44&iconColorActive=1d2d44&bgColorHighlight=f8f8f8&bgTextureHighlight=04_highlight_hard.png&bgImgOpacityHighlight=100&borderColorHighlight=ddd&fcHighlight=555&iconColorHighlight=ffffff&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
- */
-
-
-/* Component containers
-----------------------------------*/
-.ui-widget { font-family: \\\"Lucida Grande\\\", Arial, Verdana, sans-serif; font-size: 1em; }
-.ui-widget .ui-widget { font-size: 1em; }
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: \\\"Lucida Grande\\\", Arial, Verdana, sans-serif; font-size: 1em; }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee; color: #333333; }
-.ui-widget-content a { color: #333333; }
-.ui-widget-header { border: 1px solid #1d2d44; background: #1d2d44; color: #ffffff; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
-
-/* Interaction states
-----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #ddd; background: #f8f8f8; font-weight: bold; color: #555; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #ddd; background: #ffffff; font-weight: bold; color: #333; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #333; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #1d2d44; background: #f8f8f8; font-weight: bold; color: #1d2d44; }
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #1d2d44; text-decoration: none; }
-.ui-widget :active { outline: none; }
-
-/* Interaction Cues
-----------------------------------*/
-.ui-state-disabled { cursor: default !important; }
-
-/* Icons
-----------------------------------*/
-	
-/* states and images */
-.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; }
-	
-/* states and images */	
-.ui-icon { width: 16px; height: 16px; }	
-.ui-icon-closethick { background-image: url(../img/actions/delete.png); }
-
-
-/* Misc visuals
-----------------------------------*/
-
-/* Corner radius */
-.ui-corner-all, .ui-corner-top, .ui-corner-left, .ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; -khtml-border-top-left-radius: 4px; border-top-left-radius: 4px; }
-.ui-corner-all, .ui-corner-top, .ui-corner-right, .ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; -khtml-border-top-right-radius: 4px; border-top-right-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-left, .ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; -khtml-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; }
-.ui-corner-all, .ui-corner-bottom, .ui-corner-right, .ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; -khtml-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; }
-
-/* Overlays */
-.ui-widget-overlay { background: #666666; opacity: .50;filter:Alpha(Opacity=50); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/*
- * jQuery UI Resizable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizable#theming
- */
-.ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block; }
-.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
-.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
-.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
-.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; }
-.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; }
-.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
-.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
-.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
- * jQuery UI Selectable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectable#theming
- */
-.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
-/*
- * jQuery UI Autocomplete 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete#theming
- */
-.ui-autocomplete { position: absolute; cursor: default; }	
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
-
-/*
- * jQuery UI Menu 1.8.16
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-	list-style:none;
-	padding: 2px;
-	margin: 0;
-	display:block;
-	float: left;
-}
-.ui-menu .ui-menu {
-	margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-	margin:0;
-	padding: 0;
-	zoom: 1;
-	float: left;
-	clear: left;
-	width: 100%;
-}
-.ui-menu .ui-menu-item a {
-	text-decoration:none;
-	display:block;
-	padding:.2em .4em;
-	line-height:1.5;
-	zoom:1;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-	font-weight: normal;
-	margin: -1px;
-}
-/*
- * jQuery UI Button 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button#theming
- */
-.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.7em; } 
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4;  }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
-.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
-
-/*button sets*/
-.ui-buttonset { margin-right: 7px; }
-.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
-
-/* workarounds */
-button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-/*
- * jQuery UI Dialog 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog#theming
- */
-.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; background-color: #EEE;}
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
-.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
-.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
-.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
-.ui-draggable .ui-dialog-titlebar { cursor: move; }
-/*
- * jQuery UI Slider 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider#theming
- */
-.ui-slider { position: relative; text-align: left; }
-.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
-.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
-
-.ui-slider-horizontal { height: .8em; }
-.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; }
-.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
-.ui-slider-horizontal .ui-slider-range-min { left: 0; }
-.ui-slider-horizontal .ui-slider-range-max { right: 0; }
-
-.ui-slider-vertical { width: .8em; height: 100px; }
-.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
-.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
-.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
- * jQuery UI Tabs 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs#theming
- */
-.ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
-.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
-.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
-.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
-.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
-.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
-.ui-tabs .ui-tabs-hide { display: none !important; }
-/*
- * jQuery UI Datepicker 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker#theming
- */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; }
-.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
-.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
-.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
-.ui-datepicker .ui-datepicker-prev { left:2px; }
-.ui-datepicker .ui-datepicker-next { right:2px; }
-.ui-datepicker .ui-datepicker-prev-hover { left:1px; }
-.ui-datepicker .ui-datepicker-next-hover { right:1px; }
-.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
-.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
-.ui-datepicker select.ui-datepicker-month-year {width: 100%;}
-.ui-datepicker select.ui-datepicker-month, 
-.ui-datepicker select.ui-datepicker-year { width: 49%;}
-.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; }
-.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0;  }
-.ui-datepicker td { border: 0; padding: 1px; }
-.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; }
-.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; }
-.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; }
-.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; }
-
-/* with multiple calendars */
-.ui-datepicker.ui-datepicker-multi { width:auto; }
-.ui-datepicker-multi .ui-datepicker-group { float:left; }
-.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; }
-.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; }
-.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; }
-.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; }
-.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; }
-.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; }
-.ui-datepicker-row-break { clear:both; width:100%; font-size:0em; }
-
-/* RTL support */
-.ui-datepicker-rtl { direction: rtl; }
-.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; }
-.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; }
-.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group { float:right; }
-.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; }
-
-/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */
-.ui-datepicker-cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
-}/*
- * jQuery UI Progressbar 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar#theming
- */
-.ui-progressbar { height:2em; text-align: left; }
-.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/core/css/styles.css b/core/css/styles.css
index 496320561f8ab604f55a87b24fd57b58c2ccc8a1..7fb800f79e2ad20c5d63df51356a0a1d326f2914 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -94,8 +94,9 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 /* CONTENT ------------------------------------------------------------------ */
 #controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
 #controls .button { display:inline-block; }
-#content { top:3.5em; left:12.5em; position:absolute; }
-#leftcontent, .leftcontent { position:fixed; overflow:auto; top:6.4em; width:20em; background:#f8f8f8; border-right:1px solid #ddd; }
+#content { height: 100%; width: 100%; position: relative; }
+#content-wrapper { height: 100%; width: 100%; padding-top: 3.5em; padding-left: 12.5em; box-sizing: border-box; -moz-box-sizing: border-box; position: absolute;}
+#leftcontent, .leftcontent { position:fixed; top: 0; overflow:auto; width:20em; background:#f8f8f8; border-right:1px solid #ddd; box-sizing: border-box; -moz-box-sizing: border-box; height: 100%; padding-top: 6.4em }
 #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
 #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
 #leftcontent li.active, .leftcontent li.active { font-weight:bold; }
@@ -190,11 +191,12 @@ fieldset.warning legend { color:#b94a48 !important; }
 .bold { font-weight:bold; }
 .center { text-align:center; }
 
-#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
+#notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
+#notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; }
 #notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
 
-tr .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
-tr:hover .action, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
+tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
+tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
 tr .action { width:16px; height:16px; }
 .header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
 tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
diff --git a/core/js/config.php b/core/js/config.php
new file mode 100644
index 0000000000000000000000000000000000000000..9069175ed6fa58d542ee165fbb4fe3dbad42ef9e
--- /dev/null
+++ b/core/js/config.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Set the content type to Javascript
+header("Content-type: text/javascript");
+
+// Disallow caching
+header("Cache-Control: no-cache, must-revalidate"); 
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
+
+// Enable l10n support
+$l = OC_L10N::get('core');
+
+// Get the config
+$apps_paths = array();
+foreach(OC_App::getEnabledApps() as $app) {
+	$apps_paths[$app] = OC_App::getAppWebPath($app);
+}
+
+$array = array(
+	"oc_debug" => (defined('DEBUG') && DEBUG) ? 'true' : 'false',
+	"oc_webroot" => "\"".OC::$WEBROOT."\"",
+	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
+	"oc_current_user" =>  "\"".OC_User::getUser(). "\"",
+	"oc_requesttoken" =>  "\"".OC_Util::callRegister(). "\"",
+	"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'))),
+	"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
+	);
+
+// Echo it
+foreach ($array as  $setting => $value) {
+	echo("var ". $setting ."=".$value.";\n");
+}
+?>
\ No newline at end of file
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 0c2a995f33103f16c32d69f6ab5b8e050aaf28d0..f783ade7ae916cd79401a4fa98bd9b4cbe25b45d 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -40,7 +40,7 @@ OC.EventSource=function(src,data){
 			dataStr+=name+'='+encodeURIComponent(data[name])+'&';
 		}
 	}
-	dataStr+='requesttoken='+OC.EventSource.requesttoken;
+	dataStr+='requesttoken='+oc_requesttoken;
 	if(!this.useFallBack && typeof EventSource !='undefined'){
 		var joinChar = '&';
 		if(src.indexOf('?') == -1) {
diff --git a/core/js/jquery-ui-1.10.0.custom.js b/core/js/jquery-ui-1.10.0.custom.js
new file mode 100644
index 0000000000000000000000000000000000000000..ca57f47ede4632d8ec740832750eed744e87b44a
--- /dev/null
+++ b/core/js/jquery-ui-1.10.0.custom.js
@@ -0,0 +1,14850 @@
+/*! jQuery UI - v1.10.0 - 2013-01-22
+* http://jqueryui.com
+* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.position.js, jquery.ui.draggable.js, jquery.ui.droppable.js, jquery.ui.resizable.js, jquery.ui.selectable.js, jquery.ui.sortable.js, jquery.ui.accordion.js, jquery.ui.autocomplete.js, jquery.ui.button.js, jquery.ui.datepicker.js, jquery.ui.dialog.js, jquery.ui.menu.js, jquery.ui.progressbar.js, jquery.ui.slider.js, jquery.ui.spinner.js, jquery.ui.tabs.js, jquery.ui.tooltip.js, jquery.ui.effect.js, jquery.ui.effect-blind.js, jquery.ui.effect-bounce.js, jquery.ui.effect-clip.js, jquery.ui.effect-drop.js, jquery.ui.effect-explode.js, jquery.ui.effect-fade.js, jquery.ui.effect-fold.js, jquery.ui.effect-highlight.js, jquery.ui.effect-pulsate.js, jquery.ui.effect-scale.js, jquery.ui.effect-shake.js, jquery.ui.effect-slide.js, jquery.ui.effect-transfer.js
+* Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
+
+(function( $, undefined ) {
+
+var uuid = 0,
+	runiqueId = /^ui-id-\d+$/;
+
+// prevent duplicate loading
+// this is only a problem because we proxy existing functions
+// and we don't want to double proxy them
+$.ui = $.ui || {};
+if ( $.ui.version ) {
+	return;
+}
+
+$.extend( $.ui, {
+	version: "1.10.0",
+
+	keyCode: {
+		BACKSPACE: 8,
+		COMMA: 188,
+		DELETE: 46,
+		DOWN: 40,
+		END: 35,
+		ENTER: 13,
+		ESCAPE: 27,
+		HOME: 36,
+		LEFT: 37,
+		NUMPAD_ADD: 107,
+		NUMPAD_DECIMAL: 110,
+		NUMPAD_DIVIDE: 111,
+		NUMPAD_ENTER: 108,
+		NUMPAD_MULTIPLY: 106,
+		NUMPAD_SUBTRACT: 109,
+		PAGE_DOWN: 34,
+		PAGE_UP: 33,
+		PERIOD: 190,
+		RIGHT: 39,
+		SPACE: 32,
+		TAB: 9,
+		UP: 38
+	}
+});
+
+// plugins
+$.fn.extend({
+	_focus: $.fn.focus,
+	focus: function( delay, fn ) {
+		return typeof delay === "number" ?
+			this.each(function() {
+				var elem = this;
+				setTimeout(function() {
+					$( elem ).focus();
+					if ( fn ) {
+						fn.call( elem );
+					}
+				}, delay );
+			}) :
+			this._focus.apply( this, arguments );
+	},
+
+	scrollParent: function() {
+		var scrollParent;
+		if (($.ui.ie && (/(static|relative)/).test(this.css("position"))) || (/absolute/).test(this.css("position"))) {
+			scrollParent = this.parents().filter(function() {
+				return (/(relative|absolute|fixed)/).test($.css(this,"position")) && (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
+			}).eq(0);
+		} else {
+			scrollParent = this.parents().filter(function() {
+				return (/(auto|scroll)/).test($.css(this,"overflow")+$.css(this,"overflow-y")+$.css(this,"overflow-x"));
+			}).eq(0);
+		}
+
+		return (/fixed/).test(this.css("position")) || !scrollParent.length ? $(document) : scrollParent;
+	},
+
+	zIndex: function( zIndex ) {
+		if ( zIndex !== undefined ) {
+			return this.css( "zIndex", zIndex );
+		}
+
+		if ( this.length ) {
+			var elem = $( this[ 0 ] ), position, value;
+			while ( elem.length && elem[ 0 ] !== document ) {
+				// Ignore z-index if position is set to a value where z-index is ignored by the browser
+				// This makes behavior of this function consistent across browsers
+				// WebKit always returns auto if the element is positioned
+				position = elem.css( "position" );
+				if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+					// IE returns 0 when zIndex is not specified
+					// other browsers return a string
+					// we ignore the case of nested elements with an explicit value of 0
+					// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+					value = parseInt( elem.css( "zIndex" ), 10 );
+					if ( !isNaN( value ) && value !== 0 ) {
+						return value;
+					}
+				}
+				elem = elem.parent();
+			}
+		}
+
+		return 0;
+	},
+
+	uniqueId: function() {
+		return this.each(function() {
+			if ( !this.id ) {
+				this.id = "ui-id-" + (++uuid);
+			}
+		});
+	},
+
+	removeUniqueId: function() {
+		return this.each(function() {
+			if ( runiqueId.test( this.id ) ) {
+				$( this ).removeAttr( "id" );
+			}
+		});
+	}
+});
+
+// selectors
+function focusable( element, isTabIndexNotNaN ) {
+	var map, mapName, img,
+		nodeName = element.nodeName.toLowerCase();
+	if ( "area" === nodeName ) {
+		map = element.parentNode;
+		mapName = map.name;
+		if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) {
+			return false;
+		}
+		img = $( "img[usemap=#" + mapName + "]" )[0];
+		return !!img && visible( img );
+	}
+	return ( /input|select|textarea|button|object/.test( nodeName ) ?
+		!element.disabled :
+		"a" === nodeName ?
+			element.href || isTabIndexNotNaN :
+			isTabIndexNotNaN) &&
+		// the element and all of its ancestors must be visible
+		visible( element );
+}
+
+function visible( element ) {
+	return $.expr.filters.visible( element ) &&
+		!$( element ).parents().addBack().filter(function() {
+			return $.css( this, "visibility" ) === "hidden";
+		}).length;
+}
+
+$.extend( $.expr[ ":" ], {
+	data: $.expr.createPseudo ?
+		$.expr.createPseudo(function( dataName ) {
+			return function( elem ) {
+				return !!$.data( elem, dataName );
+			};
+		}) :
+		// support: jQuery <1.8
+		function( elem, i, match ) {
+			return !!$.data( elem, match[ 3 ] );
+		},
+
+	focusable: function( element ) {
+		return focusable( element, !isNaN( $.attr( element, "tabindex" ) ) );
+	},
+
+	tabbable: function( element ) {
+		var tabIndex = $.attr( element, "tabindex" ),
+			isTabIndexNaN = isNaN( tabIndex );
+		return ( isTabIndexNaN || tabIndex >= 0 ) && focusable( element, !isTabIndexNaN );
+	}
+});
+
+// support: jQuery <1.8
+if ( !$( "<a>" ).outerWidth( 1 ).jquery ) {
+	$.each( [ "Width", "Height" ], function( i, name ) {
+		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
+			type = name.toLowerCase(),
+			orig = {
+				innerWidth: $.fn.innerWidth,
+				innerHeight: $.fn.innerHeight,
+				outerWidth: $.fn.outerWidth,
+				outerHeight: $.fn.outerHeight
+			};
+
+		function reduce( elem, size, border, margin ) {
+			$.each( side, function() {
+				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
+				if ( border ) {
+					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
+				}
+				if ( margin ) {
+					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
+				}
+			});
+			return size;
+		}
+
+		$.fn[ "inner" + name ] = function( size ) {
+			if ( size === undefined ) {
+				return orig[ "inner" + name ].call( this );
+			}
+
+			return this.each(function() {
+				$( this ).css( type, reduce( this, size ) + "px" );
+			});
+		};
+
+		$.fn[ "outer" + name] = function( size, margin ) {
+			if ( typeof size !== "number" ) {
+				return orig[ "outer" + name ].call( this, size );
+			}
+
+			return this.each(function() {
+				$( this).css( type, reduce( this, size, true, margin ) + "px" );
+			});
+		};
+	});
+}
+
+// support: jQuery <1.8
+if ( !$.fn.addBack ) {
+	$.fn.addBack = function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	};
+}
+
+// support: jQuery 1.6.1, 1.6.2 (http://bugs.jquery.com/ticket/9413)
+if ( $( "<a>" ).data( "a-b", "a" ).removeData( "a-b" ).data( "a-b" ) ) {
+	$.fn.removeData = (function( removeData ) {
+		return function( key ) {
+			if ( arguments.length ) {
+				return removeData.call( this, $.camelCase( key ) );
+			} else {
+				return removeData.call( this );
+			}
+		};
+	})( $.fn.removeData );
+}
+
+
+
+
+
+// deprecated
+$.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
+
+$.support.selectstart = "onselectstart" in document.createElement( "div" );
+$.fn.extend({
+	disableSelection: function() {
+		return this.bind( ( $.support.selectstart ? "selectstart" : "mousedown" ) +
+			".ui-disableSelection", function( event ) {
+				event.preventDefault();
+			});
+	},
+
+	enableSelection: function() {
+		return this.unbind( ".ui-disableSelection" );
+	}
+});
+
+$.extend( $.ui, {
+	// $.ui.plugin is deprecated.  Use the proxy pattern instead.
+	plugin: {
+		add: function( module, option, set ) {
+			var i,
+				proto = $.ui[ module ].prototype;
+			for ( i in set ) {
+				proto.plugins[ i ] = proto.plugins[ i ] || [];
+				proto.plugins[ i ].push( [ option, set[ i ] ] );
+			}
+		},
+		call: function( instance, name, args ) {
+			var i,
+				set = instance.plugins[ name ];
+			if ( !set || !instance.element[ 0 ].parentNode || instance.element[ 0 ].parentNode.nodeType === 11 ) {
+				return;
+			}
+
+			for ( i = 0; i < set.length; i++ ) {
+				if ( instance.options[ set[ i ][ 0 ] ] ) {
+					set[ i ][ 1 ].apply( instance.element, args );
+				}
+			}
+		}
+	},
+
+	// only used by resizable
+	hasScroll: function( el, a ) {
+
+		//If overflow is hidden, the element might have extra content, but the user wants to hide it
+		if ( $( el ).css( "overflow" ) === "hidden") {
+			return false;
+		}
+
+		var scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop",
+			has = false;
+
+		if ( el[ scroll ] > 0 ) {
+			return true;
+		}
+
+		// TODO: determine which cases actually cause this to happen
+		// if the element doesn't have the scroll set, see if it's possible to
+		// set the scroll
+		el[ scroll ] = 1;
+		has = ( el[ scroll ] > 0 );
+		el[ scroll ] = 0;
+		return has;
+	}
+});
+
+})( jQuery );
+(function( $, undefined ) {
+
+var uuid = 0,
+	slice = Array.prototype.slice,
+	_cleanData = $.cleanData;
+$.cleanData = function( elems ) {
+	for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+		try {
+			$( elem ).triggerHandler( "remove" );
+		// http://bugs.jquery.com/ticket/8235
+		} catch( e ) {}
+	}
+	_cleanData( elems );
+};
+
+$.widget = function( name, base, prototype ) {
+	var fullName, existingConstructor, constructor, basePrototype,
+		// proxiedPrototype allows the provided prototype to remain unmodified
+		// so that it can be used as a mixin for multiple widgets (#8876)
+		proxiedPrototype = {},
+		namespace = name.split( "." )[ 0 ];
+
+	name = name.split( "." )[ 1 ];
+	fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	// create selector for plugin
+	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+		return !!$.data( elem, fullName );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	existingConstructor = $[ namespace ][ name ];
+	constructor = $[ namespace ][ name ] = function( options, element ) {
+		// allow instantiation without "new" keyword
+		if ( !this._createWidget ) {
+			return new constructor( options, element );
+		}
+
+		// allow instantiation without initializing for simple inheritance
+		// must use "new" keyword (the code above always passes args)
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+	// extend with the existing constructor to carry over any static properties
+	$.extend( constructor, existingConstructor, {
+		version: prototype.version,
+		// copy the object used to create the prototype in case we need to
+		// redefine the widget later
+		_proto: $.extend( {}, prototype ),
+		// track widgets that inherit from this widget in case this widget is
+		// redefined after a widget inherits from it
+		_childConstructors: []
+	});
+
+	basePrototype = new base();
+	// we need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+	basePrototype.options = $.widget.extend( {}, basePrototype.options );
+	$.each( prototype, function( prop, value ) {
+		if ( !$.isFunction( value ) ) {
+			proxiedPrototype[ prop ] = value;
+			return;
+		}
+		proxiedPrototype[ prop ] = (function() {
+			var _super = function() {
+					return base.prototype[ prop ].apply( this, arguments );
+				},
+				_superApply = function( args ) {
+					return base.prototype[ prop ].apply( this, args );
+				};
+			return function() {
+				var __super = this._super,
+					__superApply = this._superApply,
+					returnValue;
+
+				this._super = _super;
+				this._superApply = _superApply;
+
+				returnValue = value.apply( this, arguments );
+
+				this._super = __super;
+				this._superApply = __superApply;
+
+				return returnValue;
+			};
+		})();
+	});
+	constructor.prototype = $.widget.extend( basePrototype, {
+		// TODO: remove support for widgetEventPrefix
+		// always use the name + a colon as the prefix, e.g., draggable:start
+		// don't prefix for widgets that aren't DOM-based
+		widgetEventPrefix: existingConstructor ? basePrototype.widgetEventPrefix : name
+	}, proxiedPrototype, {
+		constructor: constructor,
+		namespace: namespace,
+		widgetName: name,
+		widgetFullName: fullName
+	});
+
+	// If this widget is being redefined then we need to find all widgets that
+	// are inheriting from it and redefine all of them so that they inherit from
+	// the new version of this widget. We're essentially trying to replace one
+	// level in the prototype chain.
+	if ( existingConstructor ) {
+		$.each( existingConstructor._childConstructors, function( i, child ) {
+			var childPrototype = child.prototype;
+
+			// redefine the child widget using the same prototype that was
+			// originally used, but inherit from the new version of the base
+			$.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, child._proto );
+		});
+		// remove the list of existing child constructors from the old constructor
+		// so the old child constructors can be garbage collected
+		delete existingConstructor._childConstructors;
+	} else {
+		base._childConstructors.push( constructor );
+	}
+
+	$.widget.bridge( name, constructor );
+};
+
+$.widget.extend = function( target ) {
+	var input = slice.call( arguments, 1 ),
+		inputIndex = 0,
+		inputLength = input.length,
+		key,
+		value;
+	for ( ; inputIndex < inputLength; inputIndex++ ) {
+		for ( key in input[ inputIndex ] ) {
+			value = input[ inputIndex ][ key ];
+			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+				// Clone objects
+				if ( $.isPlainObject( value ) ) {
+					target[ key ] = $.isPlainObject( target[ key ] ) ?
+						$.widget.extend( {}, target[ key ], value ) :
+						// Don't extend strings, arrays, etc. with objects
+						$.widget.extend( {}, value );
+				// Copy everything else by reference
+				} else {
+					target[ key ] = value;
+				}
+			}
+		}
+	}
+	return target;
+};
+
+$.widget.bridge = function( name, object ) {
+	var fullName = object.prototype.widgetFullName || name;
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string",
+			args = slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.widget.extend.apply( null, [ options ].concat(args) ) :
+			options;
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var methodValue,
+					instance = $.data( this, fullName );
+				if ( !instance ) {
+					return $.error( "cannot call methods on " + name + " prior to initialization; " +
+						"attempted to call method '" + options + "'" );
+				}
+				if ( !$.isFunction( instance[options] ) || options.charAt( 0 ) === "_" ) {
+					return $.error( "no such method '" + options + "' for " + name + " widget instance" );
+				}
+				methodValue = instance[ options ].apply( instance, args );
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue && methodValue.jquery ?
+						returnValue.pushStack( methodValue.get() ) :
+						methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, fullName );
+				if ( instance ) {
+					instance.option( options || {} )._init();
+				} else {
+					$.data( this, fullName, new object( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( /* options, element */ ) {};
+$.Widget._childConstructors = [];
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	defaultElement: "<div>",
+	options: {
+		disabled: false,
+
+		// callbacks
+		create: null
+	},
+	_createWidget: function( options, element ) {
+		element = $( element || this.defaultElement || this )[ 0 ];
+		this.element = $( element );
+		this.uuid = uuid++;
+		this.eventNamespace = "." + this.widgetName + this.uuid;
+		this.options = $.widget.extend( {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		this.bindings = $();
+		this.hoverable = $();
+		this.focusable = $();
+
+		if ( element !== this ) {
+			$.data( element, this.widgetFullName, this );
+			this._on( true, this.element, {
+				remove: function( event ) {
+					if ( event.target === element ) {
+						this.destroy();
+					}
+				}
+			});
+			this.document = $( element.style ?
+				// element within the document
+				element.ownerDocument :
+				// element is window or document
+				element.document || element );
+			this.window = $( this.document[0].defaultView || this.document[0].parentWindow );
+		}
+
+		this._create();
+		this._trigger( "create", null, this._getCreateEventData() );
+		this._init();
+	},
+	_getCreateOptions: $.noop,
+	_getCreateEventData: $.noop,
+	_create: $.noop,
+	_init: $.noop,
+
+	destroy: function() {
+		this._destroy();
+		// we can probably remove the unbind calls in 2.0
+		// all event bindings should go through this._on()
+		this.element
+			.unbind( this.eventNamespace )
+			// 1.9 BC for #7810
+			// TODO remove dual storage
+			.removeData( this.widgetName )
+			.removeData( this.widgetFullName )
+			// support: jquery <1.6.3
+			// http://bugs.jquery.com/ticket/9413
+			.removeData( $.camelCase( this.widgetFullName ) );
+		this.widget()
+			.unbind( this.eventNamespace )
+			.removeAttr( "aria-disabled" )
+			.removeClass(
+				this.widgetFullName + "-disabled " +
+				"ui-state-disabled" );
+
+		// clean up events and states
+		this.bindings.unbind( this.eventNamespace );
+		this.hoverable.removeClass( "ui-state-hover" );
+		this.focusable.removeClass( "ui-state-focus" );
+	},
+	_destroy: $.noop,
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key,
+			parts,
+			curOption,
+			i;
+
+		if ( arguments.length === 0 ) {
+			// don't return a reference to the internal hash
+			return $.widget.extend( {}, this.options );
+		}
+
+		if ( typeof key === "string" ) {
+			// handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } }
+			options = {};
+			parts = key.split( "." );
+			key = parts.shift();
+			if ( parts.length ) {
+				curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] );
+				for ( i = 0; i < parts.length - 1; i++ ) {
+					curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {};
+					curOption = curOption[ parts[ i ] ];
+				}
+				key = parts.pop();
+				if ( value === undefined ) {
+					return curOption[ key ] === undefined ? null : curOption[ key ];
+				}
+				curOption[ key ] = value;
+			} else {
+				if ( value === undefined ) {
+					return this.options[ key ] === undefined ? null : this.options[ key ];
+				}
+				options[ key ] = value;
+			}
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var key;
+
+		for ( key in options ) {
+			this._setOption( key, options[ key ] );
+		}
+
+		return this;
+	},
+	_setOption: function( key, value ) {
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this.widget()
+				.toggleClass( this.widgetFullName + "-disabled ui-state-disabled", !!value )
+				.attr( "aria-disabled", value );
+			this.hoverable.removeClass( "ui-state-hover" );
+			this.focusable.removeClass( "ui-state-focus" );
+		}
+
+		return this;
+	},
+
+	enable: function() {
+		return this._setOption( "disabled", false );
+	},
+	disable: function() {
+		return this._setOption( "disabled", true );
+	},
+
+	_on: function( suppressDisabledCheck, element, handlers ) {
+		var delegateElement,
+			instance = this;
+
+		// no suppressDisabledCheck flag, shuffle arguments
+		if ( typeof suppressDisabledCheck !== "boolean" ) {
+			handlers = element;
+			element = suppressDisabledCheck;
+			suppressDisabledCheck = false;
+		}
+
+		// no element argument, shuffle and use this.element
+		if ( !handlers ) {
+			handlers = element;
+			element = this.element;
+			delegateElement = this.widget();
+		} else {
+			// accept selectors, DOM elements
+			element = delegateElement = $( element );
+			this.bindings = this.bindings.add( element );
+		}
+
+		$.each( handlers, function( event, handler ) {
+			function handlerProxy() {
+				// allow widgets to customize the disabled handling
+				// - disabled as an array instead of boolean
+				// - disabled class as method for disabling individual parts
+				if ( !suppressDisabledCheck &&
+						( instance.options.disabled === true ||
+							$( this ).hasClass( "ui-state-disabled" ) ) ) {
+					return;
+				}
+				return ( typeof handler === "string" ? instance[ handler ] : handler )
+					.apply( instance, arguments );
+			}
+
+			// copy the guid so direct unbinding works
+			if ( typeof handler !== "string" ) {
+				handlerProxy.guid = handler.guid =
+					handler.guid || handlerProxy.guid || $.guid++;
+			}
+
+			var match = event.match( /^(\w+)\s*(.*)$/ ),
+				eventName = match[1] + instance.eventNamespace,
+				selector = match[2];
+			if ( selector ) {
+				delegateElement.delegate( selector, eventName, handlerProxy );
+			} else {
+				element.bind( eventName, handlerProxy );
+			}
+		});
+	},
+
+	_off: function( element, eventName ) {
+		eventName = (eventName || "").split( " " ).join( this.eventNamespace + " " ) + this.eventNamespace;
+		element.unbind( eventName ).undelegate( eventName );
+	},
+
+	_delay: function( handler, delay ) {
+		function handlerProxy() {
+			return ( typeof handler === "string" ? instance[ handler ] : handler )
+				.apply( instance, arguments );
+		}
+		var instance = this;
+		return setTimeout( handlerProxy, delay || 0 );
+	},
+
+	_hoverable: function( element ) {
+		this.hoverable = this.hoverable.add( element );
+		this._on( element, {
+			mouseenter: function( event ) {
+				$( event.currentTarget ).addClass( "ui-state-hover" );
+			},
+			mouseleave: function( event ) {
+				$( event.currentTarget ).removeClass( "ui-state-hover" );
+			}
+		});
+	},
+
+	_focusable: function( element ) {
+		this.focusable = this.focusable.add( element );
+		this._on( element, {
+			focusin: function( event ) {
+				$( event.currentTarget ).addClass( "ui-state-focus" );
+			},
+			focusout: function( event ) {
+				$( event.currentTarget ).removeClass( "ui-state-focus" );
+			}
+		});
+	},
+
+	_trigger: function( type, event, data ) {
+		var prop, orig,
+			callback = this.options[ type ];
+
+		data = data || {};
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+		// the original event may come from any element
+		// so we need to reset the target on the new event
+		event.target = this.element[ 0 ];
+
+		// copy original event properties over to the new event
+		orig = event.originalEvent;
+		if ( orig ) {
+			for ( prop in orig ) {
+				if ( !( prop in event ) ) {
+					event[ prop ] = orig[ prop ];
+				}
+			}
+		}
+
+		this.element.trigger( event, data );
+		return !( $.isFunction( callback ) &&
+			callback.apply( this.element[0], [ event ].concat( data ) ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
+	$.Widget.prototype[ "_" + method ] = function( element, options, callback ) {
+		if ( typeof options === "string" ) {
+			options = { effect: options };
+		}
+		var hasOptions,
+			effectName = !options ?
+				method :
+				options === true || typeof options === "number" ?
+					defaultEffect :
+					options.effect || defaultEffect;
+		options = options || {};
+		if ( typeof options === "number" ) {
+			options = { duration: options };
+		}
+		hasOptions = !$.isEmptyObject( options );
+		options.complete = callback;
+		if ( options.delay ) {
+			element.delay( options.delay );
+		}
+		if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) {
+			element[ method ]( options );
+		} else if ( effectName !== method && element[ effectName ] ) {
+			element[ effectName ]( options.duration, options.easing, callback );
+		} else {
+			element.queue(function( next ) {
+				$( this )[ method ]();
+				if ( callback ) {
+					callback.call( element[ 0 ] );
+				}
+				next();
+			});
+		}
+	};
+});
+
+})( jQuery );
+(function( $, undefined ) {
+
+var mouseHandled = false;
+$( document ).mouseup( function() {
+	mouseHandled = false;
+});
+
+$.widget("ui.mouse", {
+	version: "1.10.0",
+	options: {
+		cancel: "input,textarea,button,select,option",
+		distance: 1,
+		delay: 0
+	},
+	_mouseInit: function() {
+		var that = this;
+
+		this.element
+			.bind("mousedown."+this.widgetName, function(event) {
+				return that._mouseDown(event);
+			})
+			.bind("click."+this.widgetName, function(event) {
+				if (true === $.data(event.target, that.widgetName + ".preventClickEvent")) {
+					$.removeData(event.target, that.widgetName + ".preventClickEvent");
+					event.stopImmediatePropagation();
+					return false;
+				}
+			});
+
+		this.started = false;
+	},
+
+	// TODO: make sure destroying one instance of mouse doesn't mess with
+	// other instances of mouse
+	_mouseDestroy: function() {
+		this.element.unbind("."+this.widgetName);
+		if ( this._mouseMoveDelegate ) {
+			$(document)
+				.unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+				.unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
+		}
+	},
+
+	_mouseDown: function(event) {
+		// don't let more than one widget handle mouseStart
+		if( mouseHandled ) { return; }
+
+		// we may have missed mouseup (out of window)
+		(this._mouseStarted && this._mouseUp(event));
+
+		this._mouseDownEvent = event;
+
+		var that = this,
+			btnIsLeft = (event.which === 1),
+			// event.target.nodeName works around a bug in IE 8 with
+			// disabled inputs (#7620)
+			elIsCancel = (typeof this.options.cancel === "string" && event.target.nodeName ? $(event.target).closest(this.options.cancel).length : false);
+		if (!btnIsLeft || elIsCancel || !this._mouseCapture(event)) {
+			return true;
+		}
+
+		this.mouseDelayMet = !this.options.delay;
+		if (!this.mouseDelayMet) {
+			this._mouseDelayTimer = setTimeout(function() {
+				that.mouseDelayMet = true;
+			}, this.options.delay);
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted = (this._mouseStart(event) !== false);
+			if (!this._mouseStarted) {
+				event.preventDefault();
+				return true;
+			}
+		}
+
+		// Click event may never have fired (Gecko & Opera)
+		if (true === $.data(event.target, this.widgetName + ".preventClickEvent")) {
+			$.removeData(event.target, this.widgetName + ".preventClickEvent");
+		}
+
+		// these delegates are required to keep context
+		this._mouseMoveDelegate = function(event) {
+			return that._mouseMove(event);
+		};
+		this._mouseUpDelegate = function(event) {
+			return that._mouseUp(event);
+		};
+		$(document)
+			.bind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+			.bind("mouseup."+this.widgetName, this._mouseUpDelegate);
+
+		event.preventDefault();
+
+		mouseHandled = true;
+		return true;
+	},
+
+	_mouseMove: function(event) {
+		// IE mouseup check - mouseup happened when mouse was out of window
+		if ($.ui.ie && ( !document.documentMode || document.documentMode < 9 ) && !event.button) {
+			return this._mouseUp(event);
+		}
+
+		if (this._mouseStarted) {
+			this._mouseDrag(event);
+			return event.preventDefault();
+		}
+
+		if (this._mouseDistanceMet(event) && this._mouseDelayMet(event)) {
+			this._mouseStarted =
+				(this._mouseStart(this._mouseDownEvent, event) !== false);
+			(this._mouseStarted ? this._mouseDrag(event) : this._mouseUp(event));
+		}
+
+		return !this._mouseStarted;
+	},
+
+	_mouseUp: function(event) {
+		$(document)
+			.unbind("mousemove."+this.widgetName, this._mouseMoveDelegate)
+			.unbind("mouseup."+this.widgetName, this._mouseUpDelegate);
+
+		if (this._mouseStarted) {
+			this._mouseStarted = false;
+
+			if (event.target === this._mouseDownEvent.target) {
+				$.data(event.target, this.widgetName + ".preventClickEvent", true);
+			}
+
+			this._mouseStop(event);
+		}
+
+		return false;
+	},
+
+	_mouseDistanceMet: function(event) {
+		return (Math.max(
+				Math.abs(this._mouseDownEvent.pageX - event.pageX),
+				Math.abs(this._mouseDownEvent.pageY - event.pageY)
+			) >= this.options.distance
+		);
+	},
+
+	_mouseDelayMet: function(/* event */) {
+		return this.mouseDelayMet;
+	},
+
+	// These are placeholder methods, to be overriden by extending plugin
+	_mouseStart: function(/* event */) {},
+	_mouseDrag: function(/* event */) {},
+	_mouseStop: function(/* event */) {},
+	_mouseCapture: function(/* event */) { return true; }
+});
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.ui = $.ui || {};
+
+var cachedScrollbarWidth,
+	max = Math.max,
+	abs = Math.abs,
+	round = Math.round,
+	rhorizontal = /left|center|right/,
+	rvertical = /top|center|bottom/,
+	roffset = /[\+\-]\d+%?/,
+	rposition = /^\w+/,
+	rpercent = /%$/,
+	_position = $.fn.position;
+
+function getOffsets( offsets, width, height ) {
+	return [
+		parseInt( offsets[ 0 ], 10 ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ),
+		parseInt( offsets[ 1 ], 10 ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 )
+	];
+}
+
+function parseCss( element, property ) {
+	return parseInt( $.css( element, property ), 10 ) || 0;
+}
+
+function getDimensions( elem ) {
+	var raw = elem[0];
+	if ( raw.nodeType === 9 ) {
+		return {
+			width: elem.width(),
+			height: elem.height(),
+			offset: { top: 0, left: 0 }
+		};
+	}
+	if ( $.isWindow( raw ) ) {
+		return {
+			width: elem.width(),
+			height: elem.height(),
+			offset: { top: elem.scrollTop(), left: elem.scrollLeft() }
+		};
+	}
+	if ( raw.preventDefault ) {
+		return {
+			width: 0,
+			height: 0,
+			offset: { top: raw.pageY, left: raw.pageX }
+		};
+	}
+	return {
+		width: elem.outerWidth(),
+		height: elem.outerHeight(),
+		offset: elem.offset()
+	};
+}
+
+$.position = {
+	scrollbarWidth: function() {
+		if ( cachedScrollbarWidth !== undefined ) {
+			return cachedScrollbarWidth;
+		}
+		var w1, w2,
+			div = $( "<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
+			innerDiv = div.children()[0];
+
+		$( "body" ).append( div );
+		w1 = innerDiv.offsetWidth;
+		div.css( "overflow", "scroll" );
+
+		w2 = innerDiv.offsetWidth;
+
+		if ( w1 === w2 ) {
+			w2 = div[0].clientWidth;
+		}
+
+		div.remove();
+
+		return (cachedScrollbarWidth = w1 - w2);
+	},
+	getScrollInfo: function( within ) {
+		var overflowX = within.isWindow ? "" : within.element.css( "overflow-x" ),
+			overflowY = within.isWindow ? "" : within.element.css( "overflow-y" ),
+			hasOverflowX = overflowX === "scroll" ||
+				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
+			hasOverflowY = overflowY === "scroll" ||
+				( overflowY === "auto" && within.height < within.element[0].scrollHeight );
+		return {
+			width: hasOverflowX ? $.position.scrollbarWidth() : 0,
+			height: hasOverflowY ? $.position.scrollbarWidth() : 0
+		};
+	},
+	getWithinInfo: function( element ) {
+		var withinElement = $( element || window ),
+			isWindow = $.isWindow( withinElement[0] );
+		return {
+			element: withinElement,
+			isWindow: isWindow,
+			offset: withinElement.offset() || { left: 0, top: 0 },
+			scrollLeft: withinElement.scrollLeft(),
+			scrollTop: withinElement.scrollTop(),
+			width: isWindow ? withinElement.width() : withinElement.outerWidth(),
+			height: isWindow ? withinElement.height() : withinElement.outerHeight()
+		};
+	}
+};
+
+$.fn.position = function( options ) {
+	if ( !options || !options.of ) {
+		return _position.apply( this, arguments );
+	}
+
+	// make a copy, we don't want to modify arguments
+	options = $.extend( {}, options );
+
+	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
+		target = $( options.of ),
+		within = $.position.getWithinInfo( options.within ),
+		scrollInfo = $.position.getScrollInfo( within ),
+		collision = ( options.collision || "flip" ).split( " " ),
+		offsets = {};
+
+	dimensions = getDimensions( target );
+	if ( target[0].preventDefault ) {
+		// force left top to allow flipping
+		options.at = "left top";
+	}
+	targetWidth = dimensions.width;
+	targetHeight = dimensions.height;
+	targetOffset = dimensions.offset;
+	// clone to reuse original targetOffset later
+	basePosition = $.extend( {}, targetOffset );
+
+	// force my and at to have valid horizontal and vertical positions
+	// if a value is missing or invalid, it will be converted to center
+	$.each( [ "my", "at" ], function() {
+		var pos = ( options[ this ] || "" ).split( " " ),
+			horizontalOffset,
+			verticalOffset;
+
+		if ( pos.length === 1) {
+			pos = rhorizontal.test( pos[ 0 ] ) ?
+				pos.concat( [ "center" ] ) :
+				rvertical.test( pos[ 0 ] ) ?
+					[ "center" ].concat( pos ) :
+					[ "center", "center" ];
+		}
+		pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center";
+		pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center";
+
+		// calculate offsets
+		horizontalOffset = roffset.exec( pos[ 0 ] );
+		verticalOffset = roffset.exec( pos[ 1 ] );
+		offsets[ this ] = [
+			horizontalOffset ? horizontalOffset[ 0 ] : 0,
+			verticalOffset ? verticalOffset[ 0 ] : 0
+		];
+
+		// reduce to just the positions without the offsets
+		options[ this ] = [
+			rposition.exec( pos[ 0 ] )[ 0 ],
+			rposition.exec( pos[ 1 ] )[ 0 ]
+		];
+	});
+
+	// normalize collision option
+	if ( collision.length === 1 ) {
+		collision[ 1 ] = collision[ 0 ];
+	}
+
+	if ( options.at[ 0 ] === "right" ) {
+		basePosition.left += targetWidth;
+	} else if ( options.at[ 0 ] === "center" ) {
+		basePosition.left += targetWidth / 2;
+	}
+
+	if ( options.at[ 1 ] === "bottom" ) {
+		basePosition.top += targetHeight;
+	} else if ( options.at[ 1 ] === "center" ) {
+		basePosition.top += targetHeight / 2;
+	}
+
+	atOffset = getOffsets( offsets.at, targetWidth, targetHeight );
+	basePosition.left += atOffset[ 0 ];
+	basePosition.top += atOffset[ 1 ];
+
+	return this.each(function() {
+		var collisionPosition, using,
+			elem = $( this ),
+			elemWidth = elem.outerWidth(),
+			elemHeight = elem.outerHeight(),
+			marginLeft = parseCss( this, "marginLeft" ),
+			marginTop = parseCss( this, "marginTop" ),
+			collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + scrollInfo.width,
+			collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + scrollInfo.height,
+			position = $.extend( {}, basePosition ),
+			myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() );
+
+		if ( options.my[ 0 ] === "right" ) {
+			position.left -= elemWidth;
+		} else if ( options.my[ 0 ] === "center" ) {
+			position.left -= elemWidth / 2;
+		}
+
+		if ( options.my[ 1 ] === "bottom" ) {
+			position.top -= elemHeight;
+		} else if ( options.my[ 1 ] === "center" ) {
+			position.top -= elemHeight / 2;
+		}
+
+		position.left += myOffset[ 0 ];
+		position.top += myOffset[ 1 ];
+
+		// if the browser doesn't support fractions, then round for consistent results
+		if ( !$.support.offsetFractions ) {
+			position.left = round( position.left );
+			position.top = round( position.top );
+		}
+
+		collisionPosition = {
+			marginLeft: marginLeft,
+			marginTop: marginTop
+		};
+
+		$.each( [ "left", "top" ], function( i, dir ) {
+			if ( $.ui.position[ collision[ i ] ] ) {
+				$.ui.position[ collision[ i ] ][ dir ]( position, {
+					targetWidth: targetWidth,
+					targetHeight: targetHeight,
+					elemWidth: elemWidth,
+					elemHeight: elemHeight,
+					collisionPosition: collisionPosition,
+					collisionWidth: collisionWidth,
+					collisionHeight: collisionHeight,
+					offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ],
+					my: options.my,
+					at: options.at,
+					within: within,
+					elem : elem
+				});
+			}
+		});
+
+		if ( options.using ) {
+			// adds feedback as second argument to using callback, if present
+			using = function( props ) {
+				var left = targetOffset.left - position.left,
+					right = left + targetWidth - elemWidth,
+					top = targetOffset.top - position.top,
+					bottom = top + targetHeight - elemHeight,
+					feedback = {
+						target: {
+							element: target,
+							left: targetOffset.left,
+							top: targetOffset.top,
+							width: targetWidth,
+							height: targetHeight
+						},
+						element: {
+							element: elem,
+							left: position.left,
+							top: position.top,
+							width: elemWidth,
+							height: elemHeight
+						},
+						horizontal: right < 0 ? "left" : left > 0 ? "right" : "center",
+						vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle"
+					};
+				if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) {
+					feedback.horizontal = "center";
+				}
+				if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) {
+					feedback.vertical = "middle";
+				}
+				if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) {
+					feedback.important = "horizontal";
+				} else {
+					feedback.important = "vertical";
+				}
+				options.using.call( this, props, feedback );
+			};
+		}
+
+		elem.offset( $.extend( position, { using: using } ) );
+	});
+};
+
+$.ui.position = {
+	fit: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollLeft : within.offset.left,
+				outerWidth = within.width,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = withinOffset - collisionPosLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset,
+				newOverRight;
+
+			// element is wider than within
+			if ( data.collisionWidth > outerWidth ) {
+				// element is initially over the left side of within
+				if ( overLeft > 0 && overRight <= 0 ) {
+					newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - withinOffset;
+					position.left += overLeft - newOverRight;
+				// element is initially over right side of within
+				} else if ( overRight > 0 && overLeft <= 0 ) {
+					position.left = withinOffset;
+				// element is initially over both left and right sides of within
+				} else {
+					if ( overLeft > overRight ) {
+						position.left = withinOffset + outerWidth - data.collisionWidth;
+					} else {
+						position.left = withinOffset;
+					}
+				}
+			// too far left -> align with left edge
+			} else if ( overLeft > 0 ) {
+				position.left += overLeft;
+			// too far right -> align with right edge
+			} else if ( overRight > 0 ) {
+				position.left -= overRight;
+			// adjust based on position and margin
+			} else {
+				position.left = max( position.left - collisionPosLeft, position.left );
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.isWindow ? within.scrollTop : within.offset.top,
+				outerHeight = data.within.height,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = withinOffset - collisionPosTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset,
+				newOverBottom;
+
+			// element is taller than within
+			if ( data.collisionHeight > outerHeight ) {
+				// element is initially over the top of within
+				if ( overTop > 0 && overBottom <= 0 ) {
+					newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - withinOffset;
+					position.top += overTop - newOverBottom;
+				// element is initially over bottom of within
+				} else if ( overBottom > 0 && overTop <= 0 ) {
+					position.top = withinOffset;
+				// element is initially over both top and bottom of within
+				} else {
+					if ( overTop > overBottom ) {
+						position.top = withinOffset + outerHeight - data.collisionHeight;
+					} else {
+						position.top = withinOffset;
+					}
+				}
+			// too far up -> align with top
+			} else if ( overTop > 0 ) {
+				position.top += overTop;
+			// too far down -> align with bottom edge
+			} else if ( overBottom > 0 ) {
+				position.top -= overBottom;
+			// adjust based on position and margin
+			} else {
+				position.top = max( position.top - collisionPosTop, position.top );
+			}
+		}
+	},
+	flip: {
+		left: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.left + within.scrollLeft,
+				outerWidth = within.width,
+				offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left,
+				collisionPosLeft = position.left - data.collisionPosition.marginLeft,
+				overLeft = collisionPosLeft - offsetLeft,
+				overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft,
+				myOffset = data.my[ 0 ] === "left" ?
+					-data.elemWidth :
+					data.my[ 0 ] === "right" ?
+						data.elemWidth :
+						0,
+				atOffset = data.at[ 0 ] === "left" ?
+					data.targetWidth :
+					data.at[ 0 ] === "right" ?
+						-data.targetWidth :
+						0,
+				offset = -2 * data.offset[ 0 ],
+				newOverRight,
+				newOverLeft;
+
+			if ( overLeft < 0 ) {
+				newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - outerWidth - withinOffset;
+				if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+			else if ( overRight > 0 ) {
+				newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + atOffset + offset - offsetLeft;
+				if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) {
+					position.left += myOffset + atOffset + offset;
+				}
+			}
+		},
+		top: function( position, data ) {
+			var within = data.within,
+				withinOffset = within.offset.top + within.scrollTop,
+				outerHeight = within.height,
+				offsetTop = within.isWindow ? within.scrollTop : within.offset.top,
+				collisionPosTop = position.top - data.collisionPosition.marginTop,
+				overTop = collisionPosTop - offsetTop,
+				overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop,
+				top = data.my[ 1 ] === "top",
+				myOffset = top ?
+					-data.elemHeight :
+					data.my[ 1 ] === "bottom" ?
+						data.elemHeight :
+						0,
+				atOffset = data.at[ 1 ] === "top" ?
+					data.targetHeight :
+					data.at[ 1 ] === "bottom" ?
+						-data.targetHeight :
+						0,
+				offset = -2 * data.offset[ 1 ],
+				newOverTop,
+				newOverBottom;
+			if ( overTop < 0 ) {
+				newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - outerHeight - withinOffset;
+				if ( ( position.top + myOffset + atOffset + offset) > overTop && ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+			else if ( overBottom > 0 ) {
+				newOverTop = position.top -  data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
+				if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
+					position.top += myOffset + atOffset + offset;
+				}
+			}
+		}
+	},
+	flipfit: {
+		left: function() {
+			$.ui.position.flip.left.apply( this, arguments );
+			$.ui.position.fit.left.apply( this, arguments );
+		},
+		top: function() {
+			$.ui.position.flip.top.apply( this, arguments );
+			$.ui.position.fit.top.apply( this, arguments );
+		}
+	}
+};
+
+// fraction support test
+(function () {
+	var testElement, testElementParent, testElementStyle, offsetLeft, i,
+		body = document.getElementsByTagName( "body" )[ 0 ],
+		div = document.createElement( "div" );
+
+	//Create a "fake body" for testing based on method used in jQuery.support
+	testElement = document.createElement( body ? "div" : "body" );
+	testElementStyle = {
+		visibility: "hidden",
+		width: 0,
+		height: 0,
+		border: 0,
+		margin: 0,
+		background: "none"
+	};
+	if ( body ) {
+		$.extend( testElementStyle, {
+			position: "absolute",
+			left: "-1000px",
+			top: "-1000px"
+		});
+	}
+	for ( i in testElementStyle ) {
+		testElement.style[ i ] = testElementStyle[ i ];
+	}
+	testElement.appendChild( div );
+	testElementParent = body || document.documentElement;
+	testElementParent.insertBefore( testElement, testElementParent.firstChild );
+
+	div.style.cssText = "position: absolute; left: 10.7432222px;";
+
+	offsetLeft = $( div ).offset().left;
+	$.support.offsetFractions = offsetLeft > 10 && offsetLeft < 11;
+
+	testElement.innerHTML = "";
+	testElementParent.removeChild( testElement );
+})();
+
+}( jQuery ) );
+(function( $, undefined ) {
+
+$.widget("ui.draggable", $.ui.mouse, {
+	version: "1.10.0",
+	widgetEventPrefix: "drag",
+	options: {
+		addClasses: true,
+		appendTo: "parent",
+		axis: false,
+		connectToSortable: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		iframeFix: false,
+		opacity: false,
+		refreshPositions: false,
+		revert: false,
+		revertDuration: 500,
+		scope: "default",
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		snap: false,
+		snapMode: "both",
+		snapTolerance: 20,
+		stack: false,
+		zIndex: false,
+
+		// callbacks
+		drag: null,
+		start: null,
+		stop: null
+	},
+	_create: function() {
+
+		if (this.options.helper === "original" && !(/^(?:r|a|f)/).test(this.element.css("position"))) {
+			this.element[0].style.position = "relative";
+		}
+		if (this.options.addClasses){
+			this.element.addClass("ui-draggable");
+		}
+		if (this.options.disabled){
+			this.element.addClass("ui-draggable-disabled");
+		}
+
+		this._mouseInit();
+
+	},
+
+	_destroy: function() {
+		this.element.removeClass( "ui-draggable ui-draggable-dragging ui-draggable-disabled" );
+		this._mouseDestroy();
+	},
+
+	_mouseCapture: function(event) {
+
+		var o = this.options;
+
+		// among others, prevent a drag on a resizable-handle
+		if (this.helper || o.disabled || $(event.target).closest(".ui-resizable-handle").length > 0) {
+			return false;
+		}
+
+		//Quit if we're not on a valid handle
+		this.handle = this._getHandle(event);
+		if (!this.handle) {
+			return false;
+		}
+
+		$(o.iframeFix === true ? "iframe" : o.iframeFix).each(function() {
+			$("<div class='ui-draggable-iframeFix' style='background: #fff;'></div>")
+			.css({
+				width: this.offsetWidth+"px", height: this.offsetHeight+"px",
+				position: "absolute", opacity: "0.001", zIndex: 1000
+			})
+			.css($(this).offset())
+			.appendTo("body");
+		});
+
+		return true;
+
+	},
+
+	_mouseStart: function(event) {
+
+		var o = this.options;
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		this.helper.addClass("ui-draggable-dragging");
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		//If ddmanager is used for droppables, set the global draggable
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.current = this;
+		}
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Store the helper's css position
+		this.cssPosition = this.helper.css("position");
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.positionAbs = this.element.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		//Generate the original position
+		this.originalPosition = this.position = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Set a containment if given in the options
+		if(o.containment) {
+			this._setContainment();
+		}
+
+		//Trigger event + callbacks
+		if(this._trigger("start", event) === false) {
+			this._clear();
+			return false;
+		}
+
+		//Recache the helper size
+		this._cacheHelperProportions();
+
+		//Prepare the droppable offsets
+		if ($.ui.ddmanager && !o.dropBehaviour) {
+			$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+
+		this._mouseDrag(event, true); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+
+		//If the ddmanager is used for droppables, inform the manager that dragging has started (see #5003)
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.dragStart(this, event);
+		}
+
+		return true;
+	},
+
+	_mouseDrag: function(event, noPropagation) {
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Call plugins and callbacks and use the resulting position if something is returned
+		if (!noPropagation) {
+			var ui = this._uiHash();
+			if(this._trigger("drag", event, ui) === false) {
+				this._mouseUp({});
+				return false;
+			}
+			this.position = ui.position;
+		}
+
+		if(!this.options.axis || this.options.axis !== "y") {
+			this.helper[0].style.left = this.position.left+"px";
+		}
+		if(!this.options.axis || this.options.axis !== "x") {
+			this.helper[0].style.top = this.position.top+"px";
+		}
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.drag(this, event);
+		}
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		//If we are using droppables, inform the manager about the drop
+		var element,
+			that = this,
+			elementInDom = false,
+			dropped = false;
+		if ($.ui.ddmanager && !this.options.dropBehaviour) {
+			dropped = $.ui.ddmanager.drop(this, event);
+		}
+
+		//if a drop comes from outside (a sortable)
+		if(this.dropped) {
+			dropped = this.dropped;
+			this.dropped = false;
+		}
+
+		//if the original element is no longer in the DOM don't bother to continue (see #8269)
+		element = this.element[0];
+		while ( element && (element = element.parentNode) ) {
+			if (element === document ) {
+				elementInDom = true;
+			}
+		}
+		if ( !elementInDom && this.options.helper === "original" ) {
+			return false;
+		}
+
+		if((this.options.revert === "invalid" && !dropped) || (this.options.revert === "valid" && dropped) || this.options.revert === true || ($.isFunction(this.options.revert) && this.options.revert.call(this.element, dropped))) {
+			$(this.helper).animate(this.originalPosition, parseInt(this.options.revertDuration, 10), function() {
+				if(that._trigger("stop", event) !== false) {
+					that._clear();
+				}
+			});
+		} else {
+			if(this._trigger("stop", event) !== false) {
+				this._clear();
+			}
+		}
+
+		return false;
+	},
+
+	_mouseUp: function(event) {
+		//Remove frame helpers
+		$("div.ui-draggable-iframeFix").each(function() {
+			this.parentNode.removeChild(this);
+		});
+
+		//If the ddmanager is used for droppables, inform the manager that dragging has stopped (see #5003)
+		if( $.ui.ddmanager ) {
+			$.ui.ddmanager.dragStop(this, event);
+		}
+
+		return $.ui.mouse.prototype._mouseUp.call(this, event);
+	},
+
+	cancel: function() {
+
+		if(this.helper.is(".ui-draggable-dragging")) {
+			this._mouseUp({});
+		} else {
+			this._clear();
+		}
+
+		return this;
+
+	},
+
+	_getHandle: function(event) {
+
+		var handle = !this.options.handle || !$(this.options.handle, this.element).length ? true : false;
+		$(this.options.handle, this.element)
+			.find("*")
+			.addBack()
+			.each(function() {
+				if(this === event.target) {
+					handle = true;
+				}
+			});
+
+		return handle;
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options,
+			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event])) : (o.helper === "clone" ? this.element.clone().removeAttr("id") : this.element);
+
+		if(!helper.parents("body").length) {
+			helper.appendTo((o.appendTo === "parent" ? this.element[0].parentNode : o.appendTo));
+		}
+
+		if(helper[0] !== this.element[0] && !(/(fixed|absolute)/).test(helper.css("position"))) {
+			helper.css("position", "absolute");
+		}
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj === "string") {
+			obj = obj.split(" ");
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ("left" in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ("right" in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ("top" in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ("bottom" in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		//This needs to be actually done for all browsers, since pageX/pageY includes this information
+		//Ugly IE fix
+		if((this.offsetParent[0] === document.body) ||
+			(this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
+			po = { top: 0, left: 0 };
+		}
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition === "relative") {
+			var p = this.element.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.element.css("marginLeft"),10) || 0),
+			top: (parseInt(this.element.css("marginTop"),10) || 0),
+			right: (parseInt(this.element.css("marginRight"),10) || 0),
+			bottom: (parseInt(this.element.css("marginBottom"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var over, c, ce,
+			o = this.options;
+
+		if(o.containment === "parent") {
+			o.containment = this.helper[0].parentNode;
+		}
+		if(o.containment === "document" || o.containment === "window") {
+			this.containment = [
+				o.containment === "document" ? 0 : $(window).scrollLeft() - this.offset.relative.left - this.offset.parent.left,
+				o.containment === "document" ? 0 : $(window).scrollTop() - this.offset.relative.top - this.offset.parent.top,
+				(o.containment === "document" ? 0 : $(window).scrollLeft()) + $(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
+				(o.containment === "document" ? 0 : $(window).scrollTop()) + ($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+		if(!(/^(document|window|parent)$/).test(o.containment) && o.containment.constructor !== Array) {
+			c = $(o.containment);
+			ce = c[0];
+
+			if(!ce) {
+				return;
+			}
+
+			over = ($(ce).css("overflow") !== "hidden");
+
+			this.containment = [
+				(parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0),
+				(parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0),
+				(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left - this.margins.right,
+				(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top  - this.margins.bottom
+			];
+			this.relative_container = c;
+
+		} else if(o.containment.constructor === Array) {
+			this.containment = o.containment;
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) {
+			pos = this.position;
+		}
+
+		var mod = d === "absolute" ? 1 : -1,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top	+																// The absolute mouse position
+				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top * mod -										// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left +																// The absolute mouse position
+				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var containment, co, top, left,
+			o = this.options,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
+			scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName),
+			pageX = event.pageX,
+			pageY = event.pageY;
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+			if(this.containment) {
+			if (this.relative_container){
+				co = this.relative_container.offset();
+				containment = [ this.containment[0] + co.left,
+					this.containment[1] + co.top,
+					this.containment[2] + co.left,
+					this.containment[3] + co.top ];
+			}
+			else {
+				containment = this.containment;
+			}
+
+				if(event.pageX - this.offset.click.left < containment[0]) {
+					pageX = containment[0] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top < containment[1]) {
+					pageY = containment[1] + this.offset.click.top;
+				}
+				if(event.pageX - this.offset.click.left > containment[2]) {
+					pageX = containment[2] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top > containment[3]) {
+					pageY = containment[3] + this.offset.click.top;
+				}
+			}
+
+			if(o.grid) {
+				//Check for grid elements set to 0 to prevent divide by 0 error causing invalid argument errors in IE (see ticket #6950)
+				top = o.grid[1] ? this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1] : this.originalPageY;
+				pageY = containment ? ((top - this.offset.click.top >= containment[1] || top - this.offset.click.top > containment[3]) ? top : ((top - this.offset.click.top >= containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				left = o.grid[0] ? this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0] : this.originalPageX;
+				pageX = containment ? ((left - this.offset.click.left >= containment[0] || left - this.offset.click.left > containment[2]) ? left : ((left - this.offset.click.left >= containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY -																	// The absolute mouse position
+				this.offset.click.top	-												// Click offset (relative to the element)
+				this.offset.relative.top -												// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX -																	// The absolute mouse position
+				this.offset.click.left -												// Click offset (relative to the element)
+				this.offset.relative.left -												// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_clear: function() {
+		this.helper.removeClass("ui-draggable-dragging");
+		if(this.helper[0] !== this.element[0] && !this.cancelHelperRemoval) {
+			this.helper.remove();
+		}
+		this.helper = null;
+		this.cancelHelperRemoval = false;
+	},
+
+	// From now on bulk stuff - mainly helpers
+
+	_trigger: function(type, event, ui) {
+		ui = ui || this._uiHash();
+		$.ui.plugin.call(this, type, [event, ui]);
+		//The absolute position has to be recalculated after plugins
+		if(type === "drag") {
+			this.positionAbs = this._convertPositionTo("absolute");
+		}
+		return $.Widget.prototype._trigger.call(this, type, event, ui);
+	},
+
+	plugins: {},
+
+	_uiHash: function() {
+		return {
+			helper: this.helper,
+			position: this.position,
+			originalPosition: this.originalPosition,
+			offset: this.positionAbs
+		};
+	}
+
+});
+
+$.ui.plugin.add("draggable", "connectToSortable", {
+	start: function(event, ui) {
+
+		var inst = $(this).data("ui-draggable"), o = inst.options,
+			uiSortable = $.extend({}, ui, { item: inst.element });
+		inst.sortables = [];
+		$(o.connectToSortable).each(function() {
+			var sortable = $.data(this, "ui-sortable");
+			if (sortable && !sortable.options.disabled) {
+				inst.sortables.push({
+					instance: sortable,
+					shouldRevert: sortable.options.revert
+				});
+				sortable.refreshPositions();	// Call the sortable's refreshPositions at drag start to refresh the containerCache since the sortable container cache is used in drag and needs to be up to date (this will ensure it's initialised as well as being kept in step with any changes that might have happened on the page).
+				sortable._trigger("activate", event, uiSortable);
+			}
+		});
+
+	},
+	stop: function(event, ui) {
+
+		//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
+		var inst = $(this).data("ui-draggable"),
+			uiSortable = $.extend({}, ui, { item: inst.element });
+
+		$.each(inst.sortables, function() {
+			if(this.instance.isOver) {
+
+				this.instance.isOver = 0;
+
+				inst.cancelHelperRemoval = true; //Don't remove the helper in the draggable instance
+				this.instance.cancelHelperRemoval = false; //Remove it in the sortable instance (so sortable plugins like revert still work)
+
+				//The sortable revert is supported, and we have to set a temporary dropped variable on the draggable to support revert: "valid/invalid"
+				if(this.shouldRevert) {
+					this.instance.options.revert = true;
+				}
+
+				//Trigger the stop of the sortable
+				this.instance._mouseStop(event);
+
+				this.instance.options.helper = this.instance.options._helper;
+
+				//If the helper has been the original item, restore properties in the sortable
+				if(inst.options.helper === "original") {
+					this.instance.currentItem.css({ top: "auto", left: "auto" });
+				}
+
+			} else {
+				this.instance.cancelHelperRemoval = false; //Remove the helper in the sortable instance
+				this.instance._trigger("deactivate", event, uiSortable);
+			}
+
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var inst = $(this).data("ui-draggable"), that = this;
+
+		$.each(inst.sortables, function() {
+
+			var innermostIntersecting = false,
+				thisSortable = this;
+
+			//Copy over some variables to allow calling the sortable's native _intersectsWith
+			this.instance.positionAbs = inst.positionAbs;
+			this.instance.helperProportions = inst.helperProportions;
+			this.instance.offset.click = inst.offset.click;
+
+			if(this.instance._intersectsWith(this.instance.containerCache)) {
+				innermostIntersecting = true;
+				$.each(inst.sortables, function () {
+					this.instance.positionAbs = inst.positionAbs;
+					this.instance.helperProportions = inst.helperProportions;
+					this.instance.offset.click = inst.offset.click;
+					if (this !== thisSortable &&
+						this.instance._intersectsWith(this.instance.containerCache) &&
+						$.ui.contains(thisSortable.instance.element[0], this.instance.element[0])
+					) {
+						innermostIntersecting = false;
+					}
+					return innermostIntersecting;
+				});
+			}
+
+
+			if(innermostIntersecting) {
+				//If it intersects, we use a little isOver variable and set it once, so our move-in stuff gets fired only once
+				if(!this.instance.isOver) {
+
+					this.instance.isOver = 1;
+					//Now we fake the start of dragging for the sortable instance,
+					//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
+					//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
+					this.instance.currentItem = $(that).clone().removeAttr("id").appendTo(this.instance.element).data("ui-sortable-item", true);
+					this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
+					this.instance.options.helper = function() { return ui.helper[0]; };
+
+					event.target = this.instance.currentItem[0];
+					this.instance._mouseCapture(event, true);
+					this.instance._mouseStart(event, true, true);
+
+					//Because the browser event is way off the new appended portlet, we modify a couple of variables to reflect the changes
+					this.instance.offset.click.top = inst.offset.click.top;
+					this.instance.offset.click.left = inst.offset.click.left;
+					this.instance.offset.parent.left -= inst.offset.parent.left - this.instance.offset.parent.left;
+					this.instance.offset.parent.top -= inst.offset.parent.top - this.instance.offset.parent.top;
+
+					inst._trigger("toSortable", event);
+					inst.dropped = this.instance.element; //draggable revert needs that
+					//hack so receive/update callbacks work (mostly)
+					inst.currentItem = inst.element;
+					this.instance.fromOutside = inst;
+
+				}
+
+				//Provided we did all the previous steps, we can fire the drag event of the sortable on every draggable drag, when it intersects with the sortable
+				if(this.instance.currentItem) {
+					this.instance._mouseDrag(event);
+				}
+
+			} else {
+
+				//If it doesn't intersect with the sortable, and it intersected before,
+				//we fake the drag stop of the sortable, but make sure it doesn't remove the helper by using cancelHelperRemoval
+				if(this.instance.isOver) {
+
+					this.instance.isOver = 0;
+					this.instance.cancelHelperRemoval = true;
+
+					//Prevent reverting on this forced stop
+					this.instance.options.revert = false;
+
+					// The out event needs to be triggered independently
+					this.instance._trigger("out", event, this.instance._uiHash(this.instance));
+
+					this.instance._mouseStop(event, true);
+					this.instance.options.helper = this.instance.options._helper;
+
+					//Now we remove our currentItem, the list group clone again, and the placeholder, and animate the helper back to it's original size
+					this.instance.currentItem.remove();
+					if(this.instance.placeholder) {
+						this.instance.placeholder.remove();
+					}
+
+					inst._trigger("fromSortable", event);
+					inst.dropped = false; //draggable revert needs that
+				}
+
+			}
+
+		});
+
+	}
+});
+
+$.ui.plugin.add("draggable", "cursor", {
+	start: function() {
+		var t = $("body"), o = $(this).data("ui-draggable").options;
+		if (t.css("cursor")) {
+			o._cursor = t.css("cursor");
+		}
+		t.css("cursor", o.cursor);
+	},
+	stop: function() {
+		var o = $(this).data("ui-draggable").options;
+		if (o._cursor) {
+			$("body").css("cursor", o._cursor);
+		}
+	}
+});
+
+$.ui.plugin.add("draggable", "opacity", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data("ui-draggable").options;
+		if(t.css("opacity")) {
+			o._opacity = t.css("opacity");
+		}
+		t.css("opacity", o.opacity);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data("ui-draggable").options;
+		if(o._opacity) {
+			$(ui.helper).css("opacity", o._opacity);
+		}
+	}
+});
+
+$.ui.plugin.add("draggable", "scroll", {
+	start: function() {
+		var i = $(this).data("ui-draggable");
+		if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
+			i.overflowOffset = i.scrollParent.offset();
+		}
+	},
+	drag: function( event ) {
+
+		var i = $(this).data("ui-draggable"), o = i.options, scrolled = false;
+
+		if(i.scrollParent[0] !== document && i.scrollParent[0].tagName !== "HTML") {
+
+			if(!o.axis || o.axis !== "x") {
+				if((i.overflowOffset.top + i.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop + o.scrollSpeed;
+				} else if(event.pageY - i.overflowOffset.top < o.scrollSensitivity) {
+					i.scrollParent[0].scrollTop = scrolled = i.scrollParent[0].scrollTop - o.scrollSpeed;
+				}
+			}
+
+			if(!o.axis || o.axis !== "y") {
+				if((i.overflowOffset.left + i.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft + o.scrollSpeed;
+				} else if(event.pageX - i.overflowOffset.left < o.scrollSensitivity) {
+					i.scrollParent[0].scrollLeft = scrolled = i.scrollParent[0].scrollLeft - o.scrollSpeed;
+				}
+			}
+
+		} else {
+
+			if(!o.axis || o.axis !== "x") {
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				} else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+				}
+			}
+
+			if(!o.axis || o.axis !== "y") {
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				} else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+				}
+			}
+
+		}
+
+		if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+			$.ui.ddmanager.prepareOffsets(i, event);
+		}
+
+	}
+});
+
+$.ui.plugin.add("draggable", "snap", {
+	start: function() {
+
+		var i = $(this).data("ui-draggable"),
+			o = i.options;
+
+		i.snapElements = [];
+
+		$(o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap).each(function() {
+			var $t = $(this),
+				$o = $t.offset();
+			if(this !== i.element[0]) {
+				i.snapElements.push({
+					item: this,
+					width: $t.outerWidth(), height: $t.outerHeight(),
+					top: $o.top, left: $o.left
+				});
+			}
+		});
+
+	},
+	drag: function(event, ui) {
+
+		var ts, bs, ls, rs, l, r, t, b, i, first,
+			inst = $(this).data("ui-draggable"),
+			o = inst.options,
+			d = o.snapTolerance,
+			x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
+			y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height;
+
+		for (i = inst.snapElements.length - 1; i >= 0; i--){
+
+			l = inst.snapElements[i].left;
+			r = l + inst.snapElements[i].width;
+			t = inst.snapElements[i].top;
+			b = t + inst.snapElements[i].height;
+
+			//Yes, I know, this is insane ;)
+			if(!((l-d < x1 && x1 < r+d && t-d < y1 && y1 < b+d) || (l-d < x1 && x1 < r+d && t-d < y2 && y2 < b+d) || (l-d < x2 && x2 < r+d && t-d < y1 && y1 < b+d) || (l-d < x2 && x2 < r+d && t-d < y2 && y2 < b+d))) {
+				if(inst.snapElements[i].snapping) {
+					(inst.options.snap.release && inst.options.snap.release.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+				}
+				inst.snapElements[i].snapping = false;
+				continue;
+			}
+
+			if(o.snapMode !== "inner") {
+				ts = Math.abs(t - y2) <= d;
+				bs = Math.abs(b - y1) <= d;
+				ls = Math.abs(l - x2) <= d;
+				rs = Math.abs(r - x1) <= d;
+				if(ts) {
+					ui.position.top = inst._convertPositionTo("relative", { top: t - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				}
+				if(bs) {
+					ui.position.top = inst._convertPositionTo("relative", { top: b, left: 0 }).top - inst.margins.top;
+				}
+				if(ls) {
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l - inst.helperProportions.width }).left - inst.margins.left;
+				}
+				if(rs) {
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r }).left - inst.margins.left;
+				}
+			}
+
+			first = (ts || bs || ls || rs);
+
+			if(o.snapMode !== "outer") {
+				ts = Math.abs(t - y1) <= d;
+				bs = Math.abs(b - y2) <= d;
+				ls = Math.abs(l - x1) <= d;
+				rs = Math.abs(r - x2) <= d;
+				if(ts) {
+					ui.position.top = inst._convertPositionTo("relative", { top: t, left: 0 }).top - inst.margins.top;
+				}
+				if(bs) {
+					ui.position.top = inst._convertPositionTo("relative", { top: b - inst.helperProportions.height, left: 0 }).top - inst.margins.top;
+				}
+				if(ls) {
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: l }).left - inst.margins.left;
+				}
+				if(rs) {
+					ui.position.left = inst._convertPositionTo("relative", { top: 0, left: r - inst.helperProportions.width }).left - inst.margins.left;
+				}
+			}
+
+			if(!inst.snapElements[i].snapping && (ts || bs || ls || rs || first)) {
+				(inst.options.snap.snap && inst.options.snap.snap.call(inst.element, event, $.extend(inst._uiHash(), { snapItem: inst.snapElements[i].item })));
+			}
+			inst.snapElements[i].snapping = (ts || bs || ls || rs || first);
+
+		}
+
+	}
+});
+
+$.ui.plugin.add("draggable", "stack", {
+	start: function() {
+
+		var min,
+			o = $(this).data("ui-draggable").options,
+			group = $.makeArray($(o.stack)).sort(function(a,b) {
+				return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
+			});
+
+		if (!group.length) { return; }
+
+		min = parseInt(group[0].style.zIndex, 10) || 0;
+		$(group).each(function(i) {
+			this.style.zIndex = min + i;
+		});
+
+		this[0].style.zIndex = min + group.length;
+
+	}
+});
+
+$.ui.plugin.add("draggable", "zIndex", {
+	start: function(event, ui) {
+		var t = $(ui.helper), o = $(this).data("ui-draggable").options;
+		if(t.css("zIndex")) {
+			o._zIndex = t.css("zIndex");
+		}
+		t.css("zIndex", o.zIndex);
+	},
+	stop: function(event, ui) {
+		var o = $(this).data("ui-draggable").options;
+		if(o._zIndex) {
+			$(ui.helper).css("zIndex", o._zIndex);
+		}
+	}
+});
+
+})(jQuery);
+(function( $, undefined ) {
+
+function isOverAxis( x, reference, size ) {
+	return ( x > reference ) && ( x < ( reference + size ) );
+}
+
+$.widget("ui.droppable", {
+	version: "1.10.0",
+	widgetEventPrefix: "drop",
+	options: {
+		accept: "*",
+		activeClass: false,
+		addClasses: true,
+		greedy: false,
+		hoverClass: false,
+		scope: "default",
+		tolerance: "intersect",
+
+		// callbacks
+		activate: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
+	},
+	_create: function() {
+
+		var o = this.options,
+			accept = o.accept;
+
+		this.isover = false;
+		this.isout = true;
+
+		this.accept = $.isFunction(accept) ? accept : function(d) {
+			return d.is(accept);
+		};
+
+		//Store the droppable's proportions
+		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
+
+		// Add the reference and positions to the manager
+		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
+		$.ui.ddmanager.droppables[o.scope].push(this);
+
+		(o.addClasses && this.element.addClass("ui-droppable"));
+
+	},
+
+	_destroy: function() {
+		var i = 0,
+			drop = $.ui.ddmanager.droppables[this.options.scope];
+
+		for ( ; i < drop.length; i++ ) {
+			if ( drop[i] === this ) {
+				drop.splice(i, 1);
+			}
+		}
+
+		this.element.removeClass("ui-droppable ui-droppable-disabled");
+	},
+
+	_setOption: function(key, value) {
+
+		if(key === "accept") {
+			this.accept = $.isFunction(value) ? value : function(d) {
+				return d.is(value);
+			};
+		}
+		$.Widget.prototype._setOption.apply(this, arguments);
+	},
+
+	_activate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) {
+			this.element.addClass(this.options.activeClass);
+		}
+		if(draggable){
+			this._trigger("activate", event, this.ui(draggable));
+		}
+	},
+
+	_deactivate: function(event) {
+		var draggable = $.ui.ddmanager.current;
+		if(this.options.activeClass) {
+			this.element.removeClass(this.options.activeClass);
+		}
+		if(draggable){
+			this._trigger("deactivate", event, this.ui(draggable));
+		}
+	},
+
+	_over: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return;
+		}
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) {
+				this.element.addClass(this.options.hoverClass);
+			}
+			this._trigger("over", event, this.ui(draggable));
+		}
+
+	},
+
+	_out: function(event) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return;
+		}
+
+		if (this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.hoverClass) {
+				this.element.removeClass(this.options.hoverClass);
+			}
+			this._trigger("out", event, this.ui(draggable));
+		}
+
+	},
+
+	_drop: function(event,custom) {
+
+		var draggable = custom || $.ui.ddmanager.current,
+			childrenIntersection = false;
+
+		// Bail if draggable and droppable are same element
+		if (!draggable || (draggable.currentItem || draggable.element)[0] === this.element[0]) {
+			return false;
+		}
+
+		this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function() {
+			var inst = $.data(this, "ui-droppable");
+			if(
+				inst.options.greedy &&
+				!inst.options.disabled &&
+				inst.options.scope === draggable.options.scope &&
+				inst.accept.call(inst.element[0], (draggable.currentItem || draggable.element)) &&
+				$.ui.intersect(draggable, $.extend(inst, { offset: inst.element.offset() }), inst.options.tolerance)
+			) { childrenIntersection = true; return false; }
+		});
+		if(childrenIntersection) {
+			return false;
+		}
+
+		if(this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+			if(this.options.activeClass) {
+				this.element.removeClass(this.options.activeClass);
+			}
+			if(this.options.hoverClass) {
+				this.element.removeClass(this.options.hoverClass);
+			}
+			this._trigger("drop", event, this.ui(draggable));
+			return this.element;
+		}
+
+		return false;
+
+	},
+
+	ui: function(c) {
+		return {
+			draggable: (c.currentItem || c.element),
+			helper: c.helper,
+			position: c.position,
+			offset: c.positionAbs
+		};
+	}
+
+});
+
+$.ui.intersect = function(draggable, droppable, toleranceMode) {
+
+	if (!droppable.offset) {
+		return false;
+	}
+
+	var draggableLeft, draggableTop,
+		x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
+		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height,
+		l = droppable.offset.left, r = l + droppable.proportions.width,
+		t = droppable.offset.top, b = t + droppable.proportions.height;
+
+	switch (toleranceMode) {
+		case "fit":
+			return (l <= x1 && x2 <= r && t <= y1 && y2 <= b);
+		case "intersect":
+			return (l < x1 + (draggable.helperProportions.width / 2) && // Right Half
+				x2 - (draggable.helperProportions.width / 2) < r && // Left Half
+				t < y1 + (draggable.helperProportions.height / 2) && // Bottom Half
+				y2 - (draggable.helperProportions.height / 2) < b ); // Top Half
+		case "pointer":
+			draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left);
+			draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top);
+			return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width );
+		case "touch":
+			return (
+				(y1 >= t && y1 <= b) ||	// Top edge touching
+				(y2 >= t && y2 <= b) ||	// Bottom edge touching
+				(y1 < t && y2 > b)		// Surrounded vertically
+			) && (
+				(x1 >= l && x1 <= r) ||	// Left edge touching
+				(x2 >= l && x2 <= r) ||	// Right edge touching
+				(x1 < l && x2 > r)		// Surrounded horizontally
+			);
+		default:
+			return false;
+		}
+
+};
+
+/*
+	This manager tracks offsets of draggables and droppables
+*/
+$.ui.ddmanager = {
+	current: null,
+	droppables: { "default": [] },
+	prepareOffsets: function(t, event) {
+
+		var i, j,
+			m = $.ui.ddmanager.droppables[t.options.scope] || [],
+			type = event ? event.type : null, // workaround for #2317
+			list = (t.currentItem || t.element).find(":data(ui-droppable)").addBack();
+
+		droppablesLoop: for (i = 0; i < m.length; i++) {
+
+			//No disabled and non-accepted
+			if(m[i].options.disabled || (t && !m[i].accept.call(m[i].element[0],(t.currentItem || t.element)))) {
+				continue;
+			}
+
+			// Filter out elements in the current dragged item
+			for (j=0; j < list.length; j++) {
+				if(list[j] === m[i].element[0]) {
+					m[i].proportions.height = 0;
+					continue droppablesLoop;
+				}
+			}
+
+			m[i].visible = m[i].element.css("display") !== "none";
+			if(!m[i].visible) {
+				continue;
+			}
+
+			//Activate the droppable if used directly from draggables
+			if(type === "mousedown") {
+				m[i]._activate.call(m[i], event);
+			}
+
+			m[i].offset = m[i].element.offset();
+			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
+
+		}
+
+	},
+	drop: function(draggable, event) {
+
+		var dropped = false;
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(!this.options) {
+				return;
+			}
+			if (!this.options.disabled && this.visible && $.ui.intersect(draggable, this, this.options.tolerance)) {
+				dropped = this._drop.call(this, event) || dropped;
+			}
+
+			if (!this.options.disabled && this.visible && this.accept.call(this.element[0],(draggable.currentItem || draggable.element))) {
+				this.isout = true;
+				this.isover = false;
+				this._deactivate.call(this, event);
+			}
+
+		});
+		return dropped;
+
+	},
+	dragStart: function( draggable, event ) {
+		//Listen for scrolling so that if the dragging causes scrolling the position of the droppables can be recalculated (see #5003)
+		draggable.element.parentsUntil( "body" ).bind( "scroll.droppable", function() {
+			if( !draggable.options.refreshPositions ) {
+				$.ui.ddmanager.prepareOffsets( draggable, event );
+			}
+		});
+	},
+	drag: function(draggable, event) {
+
+		//If you have a highly dynamic page, you might try this option. It renders positions every time you move the mouse.
+		if(draggable.options.refreshPositions) {
+			$.ui.ddmanager.prepareOffsets(draggable, event);
+		}
+
+		//Run through all droppables and check their positions based on specific tolerance options
+		$.each($.ui.ddmanager.droppables[draggable.options.scope] || [], function() {
+
+			if(this.options.disabled || this.greedyChild || !this.visible) {
+				return;
+			}
+
+			var parentInstance, scope, parent,
+				intersects = $.ui.intersect(draggable, this, this.options.tolerance),
+				c = !intersects && this.isover ? "isout" : (intersects && !this.isover ? "isover" : null);
+			if(!c) {
+				return;
+			}
+
+			if (this.options.greedy) {
+				// find droppable parents with same scope
+				scope = this.options.scope;
+				parent = this.element.parents(":data(ui-droppable)").filter(function () {
+					return $.data(this, "ui-droppable").options.scope === scope;
+				});
+
+				if (parent.length) {
+					parentInstance = $.data(parent[0], "ui-droppable");
+					parentInstance.greedyChild = (c === "isover");
+				}
+			}
+
+			// we just moved into a greedy child
+			if (parentInstance && c === "isover") {
+				parentInstance.isover = false;
+				parentInstance.isout = true;
+				parentInstance._out.call(parentInstance, event);
+			}
+
+			this[c] = true;
+			this[c === "isout" ? "isover" : "isout"] = false;
+			this[c === "isover" ? "_over" : "_out"].call(this, event);
+
+			// we just moved out of a greedy child
+			if (parentInstance && c === "isout") {
+				parentInstance.isout = false;
+				parentInstance.isover = true;
+				parentInstance._over.call(parentInstance, event);
+			}
+		});
+
+	},
+	dragStop: function( draggable, event ) {
+		draggable.element.parentsUntil( "body" ).unbind( "scroll.droppable" );
+		//Call prepareOffsets one final time since IE does not fire return scroll events when overflow was caused by drag (see #5003)
+		if( !draggable.options.refreshPositions ) {
+			$.ui.ddmanager.prepareOffsets( draggable, event );
+		}
+	}
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+function num(v) {
+	return parseInt(v, 10) || 0;
+}
+
+function isNumber(value) {
+	return !isNaN(parseInt(value, 10));
+}
+
+$.widget("ui.resizable", $.ui.mouse, {
+	version: "1.10.0",
+	widgetEventPrefix: "resize",
+	options: {
+		alsoResize: false,
+		animate: false,
+		animateDuration: "slow",
+		animateEasing: "swing",
+		aspectRatio: false,
+		autoHide: false,
+		containment: false,
+		ghost: false,
+		grid: false,
+		handles: "e,s,se",
+		helper: false,
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 10,
+		minWidth: 10,
+		// See #7960
+		zIndex: 90,
+
+		// callbacks
+		resize: null,
+		start: null,
+		stop: null
+	},
+	_create: function() {
+
+		var n, i, handle, axis, hname,
+			that = this,
+			o = this.options;
+		this.element.addClass("ui-resizable");
+
+		$.extend(this, {
+			_aspectRatio: !!(o.aspectRatio),
+			aspectRatio: o.aspectRatio,
+			originalElement: this.element,
+			_proportionallyResizeElements: [],
+			_helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null
+		});
+
+		//Wrap the element if it cannot hold child nodes
+		if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
+
+			//Create a wrapper element and set the wrapper to the new current internal element
+			this.element.wrap(
+				$("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({
+					position: this.element.css("position"),
+					width: this.element.outerWidth(),
+					height: this.element.outerHeight(),
+					top: this.element.css("top"),
+					left: this.element.css("left")
+				})
+			);
+
+			//Overwrite the original this.element
+			this.element = this.element.parent().data(
+				"ui-resizable", this.element.data("ui-resizable")
+			);
+
+			this.elementIsWrapper = true;
+
+			//Move margins to the wrapper
+			this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
+			this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+
+			//Prevent Safari textarea resize
+			this.originalResizeStyle = this.originalElement.css("resize");
+			this.originalElement.css("resize", "none");
+
+			//Push the actual element to our proportionallyResize internal array
+			this._proportionallyResizeElements.push(this.originalElement.css({ position: "static", zoom: 1, display: "block" }));
+
+			// avoid IE jump (hard set the margin)
+			this.originalElement.css({ margin: this.originalElement.css("margin") });
+
+			// fix handlers offset
+			this._proportionallyResize();
+
+		}
+
+		this.handles = o.handles || (!$(".ui-resizable-handle", this.element).length ? "e,s,se" : { n: ".ui-resizable-n", e: ".ui-resizable-e", s: ".ui-resizable-s", w: ".ui-resizable-w", se: ".ui-resizable-se", sw: ".ui-resizable-sw", ne: ".ui-resizable-ne", nw: ".ui-resizable-nw" });
+		if(this.handles.constructor === String) {
+
+			if ( this.handles === "all") {
+				this.handles = "n,e,s,w,se,sw,ne,nw";
+			}
+
+			n = this.handles.split(",");
+			this.handles = {};
+
+			for(i = 0; i < n.length; i++) {
+
+				handle = $.trim(n[i]);
+				hname = "ui-resizable-"+handle;
+				axis = $("<div class='ui-resizable-handle " + hname + "'></div>");
+
+				// Apply zIndex to all handles - see #7960
+				axis.css({ zIndex: o.zIndex });
+
+				//TODO : What's going on here?
+				if ("se" === handle) {
+					axis.addClass("ui-icon ui-icon-gripsmall-diagonal-se");
+				}
+
+				//Insert into internal handles object and append to element
+				this.handles[handle] = ".ui-resizable-"+handle;
+				this.element.append(axis);
+			}
+
+		}
+
+		this._renderAxis = function(target) {
+
+			var i, axis, padPos, padWrapper;
+
+			target = target || this.element;
+
+			for(i in this.handles) {
+
+				if(this.handles[i].constructor === String) {
+					this.handles[i] = $(this.handles[i], this.element).show();
+				}
+
+				//Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
+				if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
+
+					axis = $(this.handles[i], this.element);
+
+					//Checking the correct pad and border
+					padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
+
+					//The padding type i have to apply...
+					padPos = [ "padding",
+						/ne|nw|n/.test(i) ? "Top" :
+						/se|sw|s/.test(i) ? "Bottom" :
+						/^e$/.test(i) ? "Right" : "Left" ].join("");
+
+					target.css(padPos, padWrapper);
+
+					this._proportionallyResize();
+
+				}
+
+				//TODO: What's that good for? There's not anything to be executed left
+				if(!$(this.handles[i]).length) {
+					continue;
+				}
+			}
+		};
+
+		//TODO: make renderAxis a prototype function
+		this._renderAxis(this.element);
+
+		this._handles = $(".ui-resizable-handle", this.element)
+			.disableSelection();
+
+		//Matching axis name
+		this._handles.mouseover(function() {
+			if (!that.resizing) {
+				if (this.className) {
+					axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
+				}
+				//Axis, default = se
+				that.axis = axis && axis[1] ? axis[1] : "se";
+			}
+		});
+
+		//If we want to auto hide the elements
+		if (o.autoHide) {
+			this._handles.hide();
+			$(this.element)
+				.addClass("ui-resizable-autohide")
+				.mouseenter(function() {
+					if (o.disabled) {
+						return;
+					}
+					$(this).removeClass("ui-resizable-autohide");
+					that._handles.show();
+				})
+				.mouseleave(function(){
+					if (o.disabled) {
+						return;
+					}
+					if (!that.resizing) {
+						$(this).addClass("ui-resizable-autohide");
+						that._handles.hide();
+					}
+				});
+		}
+
+		//Initialize the mouse interaction
+		this._mouseInit();
+
+	},
+
+	_destroy: function() {
+
+		this._mouseDestroy();
+
+		var wrapper,
+			_destroy = function(exp) {
+				$(exp).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing")
+					.removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove();
+			};
+
+		//TODO: Unwrap at same DOM position
+		if (this.elementIsWrapper) {
+			_destroy(this.element);
+			wrapper = this.element;
+			this.originalElement.css({
+				position: wrapper.css("position"),
+				width: wrapper.outerWidth(),
+				height: wrapper.outerHeight(),
+				top: wrapper.css("top"),
+				left: wrapper.css("left")
+			}).insertAfter( wrapper );
+			wrapper.remove();
+		}
+
+		this.originalElement.css("resize", this.originalResizeStyle);
+		_destroy(this.originalElement);
+
+		return this;
+	},
+
+	_mouseCapture: function(event) {
+		var i, handle,
+			capture = false;
+
+		for (i in this.handles) {
+			handle = $(this.handles[i])[0];
+			if (handle === event.target || $.contains(handle, event.target)) {
+				capture = true;
+			}
+		}
+
+		return !this.options.disabled && capture;
+	},
+
+	_mouseStart: function(event) {
+
+		var curleft, curtop, cursor,
+			o = this.options,
+			iniPos = this.element.position(),
+			el = this.element;
+
+		this.resizing = true;
+
+		// bugfix for http://dev.jquery.com/ticket/1749
+		if ( (/absolute/).test( el.css("position") ) ) {
+			el.css({ position: "absolute", top: el.css("top"), left: el.css("left") });
+		} else if (el.is(".ui-draggable")) {
+			el.css({ position: "absolute", top: iniPos.top, left: iniPos.left });
+		}
+
+		this._renderProxy();
+
+		curleft = num(this.helper.css("left"));
+		curtop = num(this.helper.css("top"));
+
+		if (o.containment) {
+			curleft += $(o.containment).scrollLeft() || 0;
+			curtop += $(o.containment).scrollTop() || 0;
+		}
+
+		//Store needed variables
+		this.offset = this.helper.offset();
+		this.position = { left: curleft, top: curtop };
+		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.originalPosition = { left: curleft, top: curtop };
+		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
+		this.originalMousePosition = { left: event.pageX, top: event.pageY };
+
+		//Aspect Ratio
+		this.aspectRatio = (typeof o.aspectRatio === "number") ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
+
+		cursor = $(".ui-resizable-" + this.axis).css("cursor");
+		$("body").css("cursor", cursor === "auto" ? this.axis + "-resize" : cursor);
+
+		el.addClass("ui-resizable-resizing");
+		this._propagate("start", event);
+		return true;
+	},
+
+	_mouseDrag: function(event) {
+
+		//Increase performance, avoid regex
+		var data,
+			el = this.helper, props = {},
+			smp = this.originalMousePosition,
+			a = this.axis,
+			prevTop = this.position.top,
+			prevLeft = this.position.left,
+			prevWidth = this.size.width,
+			prevHeight = this.size.height,
+			dx = (event.pageX-smp.left)||0,
+			dy = (event.pageY-smp.top)||0,
+			trigger = this._change[a];
+
+		if (!trigger) {
+			return false;
+		}
+
+		// Calculate the attrs that will be change
+		data = trigger.apply(this, [event, dx, dy]);
+
+		// Put this in the mouseDrag handler since the user can start pressing shift while resizing
+		this._updateVirtualBoundaries(event.shiftKey);
+		if (this._aspectRatio || event.shiftKey) {
+			data = this._updateRatio(data, event);
+		}
+
+		data = this._respectSize(data, event);
+
+		this._updateCache(data);
+
+		// plugins callbacks need to be called first
+		this._propagate("resize", event);
+
+		if (this.position.top !== prevTop) {
+			props.top = this.position.top + "px";
+		}
+		if (this.position.left !== prevLeft) {
+			props.left = this.position.left + "px";
+		}
+		if (this.size.width !== prevWidth) {
+			props.width = this.size.width + "px";
+		}
+		if (this.size.height !== prevHeight) {
+			props.height = this.size.height + "px";
+		}
+		el.css(props);
+
+		if (!this._helper && this._proportionallyResizeElements.length) {
+			this._proportionallyResize();
+		}
+
+		// Call the user callback if the element was resized
+		if ( ! $.isEmptyObject(props) ) {
+			this._trigger("resize", event, this.ui());
+		}
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+
+		this.resizing = false;
+		var pr, ista, soffseth, soffsetw, s, left, top,
+			o = this.options, that = this;
+
+		if(this._helper) {
+
+			pr = this._proportionallyResizeElements;
+			ista = pr.length && (/textarea/i).test(pr[0].nodeName);
+			soffseth = ista && $.ui.hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height;
+			soffsetw = ista ? 0 : that.sizeDiff.width;
+
+			s = { width: (that.helper.width()  - soffsetw), height: (that.helper.height() - soffseth) };
+			left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null;
+			top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
+
+			if (!o.animate) {
+				this.element.css($.extend(s, { top: top, left: left }));
+			}
+
+			that.helper.height(that.size.height);
+			that.helper.width(that.size.width);
+
+			if (this._helper && !o.animate) {
+				this._proportionallyResize();
+			}
+		}
+
+		$("body").css("cursor", "auto");
+
+		this.element.removeClass("ui-resizable-resizing");
+
+		this._propagate("stop", event);
+
+		if (this._helper) {
+			this.helper.remove();
+		}
+
+		return false;
+
+	},
+
+	_updateVirtualBoundaries: function(forceAspectRatio) {
+		var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b,
+			o = this.options;
+
+		b = {
+			minWidth: isNumber(o.minWidth) ? o.minWidth : 0,
+			maxWidth: isNumber(o.maxWidth) ? o.maxWidth : Infinity,
+			minHeight: isNumber(o.minHeight) ? o.minHeight : 0,
+			maxHeight: isNumber(o.maxHeight) ? o.maxHeight : Infinity
+		};
+
+		if(this._aspectRatio || forceAspectRatio) {
+			// We want to create an enclosing box whose aspect ration is the requested one
+			// First, compute the "projected" size for each dimension based on the aspect ratio and other dimension
+			pMinWidth = b.minHeight * this.aspectRatio;
+			pMinHeight = b.minWidth / this.aspectRatio;
+			pMaxWidth = b.maxHeight * this.aspectRatio;
+			pMaxHeight = b.maxWidth / this.aspectRatio;
+
+			if(pMinWidth > b.minWidth) {
+				b.minWidth = pMinWidth;
+			}
+			if(pMinHeight > b.minHeight) {
+				b.minHeight = pMinHeight;
+			}
+			if(pMaxWidth < b.maxWidth) {
+				b.maxWidth = pMaxWidth;
+			}
+			if(pMaxHeight < b.maxHeight) {
+				b.maxHeight = pMaxHeight;
+			}
+		}
+		this._vBoundaries = b;
+	},
+
+	_updateCache: function(data) {
+		this.offset = this.helper.offset();
+		if (isNumber(data.left)) {
+			this.position.left = data.left;
+		}
+		if (isNumber(data.top)) {
+			this.position.top = data.top;
+		}
+		if (isNumber(data.height)) {
+			this.size.height = data.height;
+		}
+		if (isNumber(data.width)) {
+			this.size.width = data.width;
+		}
+	},
+
+	_updateRatio: function( data ) {
+
+		var cpos = this.position,
+			csize = this.size,
+			a = this.axis;
+
+		if (isNumber(data.height)) {
+			data.width = (data.height * this.aspectRatio);
+		} else if (isNumber(data.width)) {
+			data.height = (data.width / this.aspectRatio);
+		}
+
+		if (a === "sw") {
+			data.left = cpos.left + (csize.width - data.width);
+			data.top = null;
+		}
+		if (a === "nw") {
+			data.top = cpos.top + (csize.height - data.height);
+			data.left = cpos.left + (csize.width - data.width);
+		}
+
+		return data;
+	},
+
+	_respectSize: function( data ) {
+
+		var o = this._vBoundaries,
+			a = this.axis,
+			ismaxw = isNumber(data.width) && o.maxWidth && (o.maxWidth < data.width), ismaxh = isNumber(data.height) && o.maxHeight && (o.maxHeight < data.height),
+			isminw = isNumber(data.width) && o.minWidth && (o.minWidth > data.width), isminh = isNumber(data.height) && o.minHeight && (o.minHeight > data.height),
+			dw = this.originalPosition.left + this.originalSize.width,
+			dh = this.position.top + this.size.height,
+			cw = /sw|nw|w/.test(a), ch = /nw|ne|n/.test(a);
+		if (isminw) {
+			data.width = o.minWidth;
+		}
+		if (isminh) {
+			data.height = o.minHeight;
+		}
+		if (ismaxw) {
+			data.width = o.maxWidth;
+		}
+		if (ismaxh) {
+			data.height = o.maxHeight;
+		}
+
+		if (isminw && cw) {
+			data.left = dw - o.minWidth;
+		}
+		if (ismaxw && cw) {
+			data.left = dw - o.maxWidth;
+		}
+		if (isminh && ch) {
+			data.top = dh - o.minHeight;
+		}
+		if (ismaxh && ch) {
+			data.top = dh - o.maxHeight;
+		}
+
+		// fixing jump error on top/left - bug #2330
+		if (!data.width && !data.height && !data.left && data.top) {
+			data.top = null;
+		} else if (!data.width && !data.height && !data.top && data.left) {
+			data.left = null;
+		}
+
+		return data;
+	},
+
+	_proportionallyResize: function() {
+
+		if (!this._proportionallyResizeElements.length) {
+			return;
+		}
+
+		var i, j, borders, paddings, prel,
+			element = this.helper || this.element;
+
+		for ( i=0; i < this._proportionallyResizeElements.length; i++) {
+
+			prel = this._proportionallyResizeElements[i];
+
+			if (!this.borderDif) {
+				this.borderDif = [];
+				borders = [prel.css("borderTopWidth"), prel.css("borderRightWidth"), prel.css("borderBottomWidth"), prel.css("borderLeftWidth")];
+				paddings = [prel.css("paddingTop"), prel.css("paddingRight"), prel.css("paddingBottom"), prel.css("paddingLeft")];
+
+				for ( j = 0; j < borders.length; j++ ) {
+					this.borderDif[ j ] = ( parseInt( borders[ j ], 10 ) || 0 ) + ( parseInt( paddings[ j ], 10 ) || 0 );
+				}
+			}
+
+			prel.css({
+				height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
+				width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
+			});
+
+		}
+
+	},
+
+	_renderProxy: function() {
+
+		var el = this.element, o = this.options;
+		this.elementOffset = el.offset();
+
+		if(this._helper) {
+
+			this.helper = this.helper || $("<div style='overflow:hidden;'></div>");
+
+			this.helper.addClass(this._helper).css({
+				width: this.element.outerWidth() - 1,
+				height: this.element.outerHeight() - 1,
+				position: "absolute",
+				left: this.elementOffset.left +"px",
+				top: this.elementOffset.top +"px",
+				zIndex: ++o.zIndex //TODO: Don't modify option
+			});
+
+			this.helper
+				.appendTo("body")
+				.disableSelection();
+
+		} else {
+			this.helper = this.element;
+		}
+
+	},
+
+	_change: {
+		e: function(event, dx) {
+			return { width: this.originalSize.width + dx };
+		},
+		w: function(event, dx) {
+			var cs = this.originalSize, sp = this.originalPosition;
+			return { left: sp.left + dx, width: cs.width - dx };
+		},
+		n: function(event, dx, dy) {
+			var cs = this.originalSize, sp = this.originalPosition;
+			return { top: sp.top + dy, height: cs.height - dy };
+		},
+		s: function(event, dx, dy) {
+			return { height: this.originalSize.height + dy };
+		},
+		se: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		sw: function(event, dx, dy) {
+			return $.extend(this._change.s.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		},
+		ne: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.e.apply(this, [event, dx, dy]));
+		},
+		nw: function(event, dx, dy) {
+			return $.extend(this._change.n.apply(this, arguments), this._change.w.apply(this, [event, dx, dy]));
+		}
+	},
+
+	_propagate: function(n, event) {
+		$.ui.plugin.call(this, n, [event, this.ui()]);
+		(n !== "resize" && this._trigger(n, event, this.ui()));
+	},
+
+	plugins: {},
+
+	ui: function() {
+		return {
+			originalElement: this.originalElement,
+			element: this.element,
+			helper: this.helper,
+			position: this.position,
+			size: this.size,
+			originalSize: this.originalSize,
+			originalPosition: this.originalPosition
+		};
+	}
+
+});
+
+/*
+ * Resizable Extensions
+ */
+
+$.ui.plugin.add("resizable", "animate", {
+
+	stop: function( event ) {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			pr = that._proportionallyResizeElements,
+			ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+			soffseth = ista && $.ui.hasScroll(pr[0], "left") /* TODO - jump height */ ? 0 : that.sizeDiff.height,
+			soffsetw = ista ? 0 : that.sizeDiff.width,
+			style = { width: (that.size.width - soffsetw), height: (that.size.height - soffseth) },
+			left = (parseInt(that.element.css("left"), 10) + (that.position.left - that.originalPosition.left)) || null,
+			top = (parseInt(that.element.css("top"), 10) + (that.position.top - that.originalPosition.top)) || null;
+
+		that.element.animate(
+			$.extend(style, top && left ? { top: top, left: left } : {}), {
+				duration: o.animateDuration,
+				easing: o.animateEasing,
+				step: function() {
+
+					var data = {
+						width: parseInt(that.element.css("width"), 10),
+						height: parseInt(that.element.css("height"), 10),
+						top: parseInt(that.element.css("top"), 10),
+						left: parseInt(that.element.css("left"), 10)
+					};
+
+					if (pr && pr.length) {
+						$(pr[0]).css({ width: data.width, height: data.height });
+					}
+
+					// propagating resize, and updating values for each animation step
+					that._updateCache(data);
+					that._propagate("resize", event);
+
+				}
+			}
+		);
+	}
+
+});
+
+$.ui.plugin.add("resizable", "containment", {
+
+	start: function() {
+		var element, p, co, ch, cw, width, height,
+			that = $(this).data("ui-resizable"),
+			o = that.options,
+			el = that.element,
+			oc = o.containment,
+			ce = (oc instanceof $) ? oc.get(0) : (/parent/.test(oc)) ? el.parent().get(0) : oc;
+
+		if (!ce) {
+			return;
+		}
+
+		that.containerElement = $(ce);
+
+		if (/document/.test(oc) || oc === document) {
+			that.containerOffset = { left: 0, top: 0 };
+			that.containerPosition = { left: 0, top: 0 };
+
+			that.parentData = {
+				element: $(document), left: 0, top: 0,
+				width: $(document).width(), height: $(document).height() || document.body.parentNode.scrollHeight
+			};
+		}
+
+		// i'm a node, so compute top, left, right, bottom
+		else {
+			element = $(ce);
+			p = [];
+			$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });
+
+			that.containerOffset = element.offset();
+			that.containerPosition = element.position();
+			that.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };
+
+			co = that.containerOffset;
+			ch = that.containerSize.height;
+			cw = that.containerSize.width;
+			width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw );
+			height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
+
+			that.parentData = {
+				element: ce, left: co.left, top: co.top, width: width, height: height
+			};
+		}
+	},
+
+	resize: function( event ) {
+		var woset, hoset, isParent, isOffsetRelative,
+			that = $(this).data("ui-resizable"),
+			o = that.options,
+			co = that.containerOffset, cp = that.position,
+			pRatio = that._aspectRatio || event.shiftKey,
+			cop = { top:0, left:0 }, ce = that.containerElement;
+
+		if (ce[0] !== document && (/static/).test(ce.css("position"))) {
+			cop = co;
+		}
+
+		if (cp.left < (that._helper ? co.left : 0)) {
+			that.size.width = that.size.width + (that._helper ? (that.position.left - co.left) : (that.position.left - cop.left));
+			if (pRatio) {
+				that.size.height = that.size.width / that.aspectRatio;
+			}
+			that.position.left = o.helper ? co.left : 0;
+		}
+
+		if (cp.top < (that._helper ? co.top : 0)) {
+			that.size.height = that.size.height + (that._helper ? (that.position.top - co.top) : that.position.top);
+			if (pRatio) {
+				that.size.width = that.size.height * that.aspectRatio;
+			}
+			that.position.top = that._helper ? co.top : 0;
+		}
+
+		that.offset.left = that.parentData.left+that.position.left;
+		that.offset.top = that.parentData.top+that.position.top;
+
+		woset = Math.abs( (that._helper ? that.offset.left - cop.left : (that.offset.left - cop.left)) + that.sizeDiff.width );
+		hoset = Math.abs( (that._helper ? that.offset.top - cop.top : (that.offset.top - co.top)) + that.sizeDiff.height );
+
+		isParent = that.containerElement.get(0) === that.element.parent().get(0);
+		isOffsetRelative = /relative|absolute/.test(that.containerElement.css("position"));
+
+		if(isParent && isOffsetRelative) {
+			woset -= that.parentData.left;
+		}
+
+		if (woset + that.size.width >= that.parentData.width) {
+			that.size.width = that.parentData.width - woset;
+			if (pRatio) {
+				that.size.height = that.size.width / that.aspectRatio;
+			}
+		}
+
+		if (hoset + that.size.height >= that.parentData.height) {
+			that.size.height = that.parentData.height - hoset;
+			if (pRatio) {
+				that.size.width = that.size.height * that.aspectRatio;
+			}
+		}
+	},
+
+	stop: function(){
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			co = that.containerOffset,
+			cop = that.containerPosition,
+			ce = that.containerElement,
+			helper = $(that.helper),
+			ho = helper.offset(),
+			w = helper.outerWidth() - that.sizeDiff.width,
+			h = helper.outerHeight() - that.sizeDiff.height;
+
+		if (that._helper && !o.animate && (/relative/).test(ce.css("position"))) {
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+		}
+
+		if (that._helper && !o.animate && (/static/).test(ce.css("position"))) {
+			$(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
+		}
+
+	}
+});
+
+$.ui.plugin.add("resizable", "alsoResize", {
+
+	start: function () {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			_store = function (exp) {
+				$(exp).each(function() {
+					var el = $(this);
+					el.data("ui-resizable-alsoresize", {
+						width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
+						left: parseInt(el.css("left"), 10), top: parseInt(el.css("top"), 10)
+					});
+				});
+			};
+
+		if (typeof(o.alsoResize) === "object" && !o.alsoResize.parentNode) {
+			if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
+			else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
+		}else{
+			_store(o.alsoResize);
+		}
+	},
+
+	resize: function (event, ui) {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			os = that.originalSize,
+			op = that.originalPosition,
+			delta = {
+				height: (that.size.height - os.height) || 0, width: (that.size.width - os.width) || 0,
+				top: (that.position.top - op.top) || 0, left: (that.position.left - op.left) || 0
+			},
+
+			_alsoResize = function (exp, c) {
+				$(exp).each(function() {
+					var el = $(this), start = $(this).data("ui-resizable-alsoresize"), style = {},
+						css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ["width", "height"] : ["width", "height", "top", "left"];
+
+					$.each(css, function (i, prop) {
+						var sum = (start[prop]||0) + (delta[prop]||0);
+						if (sum && sum >= 0) {
+							style[prop] = sum || null;
+						}
+					});
+
+					el.css(style);
+				});
+			};
+
+		if (typeof(o.alsoResize) === "object" && !o.alsoResize.nodeType) {
+			$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
+		}else{
+			_alsoResize(o.alsoResize);
+		}
+	},
+
+	stop: function () {
+		$(this).removeData("resizable-alsoresize");
+	}
+});
+
+$.ui.plugin.add("resizable", "ghost", {
+
+	start: function() {
+
+		var that = $(this).data("ui-resizable"), o = that.options, cs = that.size;
+
+		that.ghost = that.originalElement.clone();
+		that.ghost
+			.css({ opacity: 0.25, display: "block", position: "relative", height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+			.addClass("ui-resizable-ghost")
+			.addClass(typeof o.ghost === "string" ? o.ghost : "");
+
+		that.ghost.appendTo(that.helper);
+
+	},
+
+	resize: function(){
+		var that = $(this).data("ui-resizable");
+		if (that.ghost) {
+			that.ghost.css({ position: "relative", height: that.size.height, width: that.size.width });
+		}
+	},
+
+	stop: function() {
+		var that = $(this).data("ui-resizable");
+		if (that.ghost && that.helper) {
+			that.helper.get(0).removeChild(that.ghost.get(0));
+		}
+	}
+
+});
+
+$.ui.plugin.add("resizable", "grid", {
+
+	resize: function() {
+		var that = $(this).data("ui-resizable"),
+			o = that.options,
+			cs = that.size,
+			os = that.originalSize,
+			op = that.originalPosition,
+			a = that.axis,
+			grid = typeof o.grid === "number" ? [o.grid, o.grid] : o.grid,
+			gridX = (grid[0]||1),
+			gridY = (grid[1]||1),
+			ox = Math.round((cs.width - os.width) / gridX) * gridX,
+			oy = Math.round((cs.height - os.height) / gridY) * gridY,
+			newWidth = os.width + ox,
+			newHeight = os.height + oy,
+			isMaxWidth = o.maxWidth && (o.maxWidth < newWidth),
+			isMaxHeight = o.maxHeight && (o.maxHeight < newHeight),
+			isMinWidth = o.minWidth && (o.minWidth > newWidth),
+			isMinHeight = o.minHeight && (o.minHeight > newHeight);
+
+		o.grid = grid;
+
+		if (isMinWidth) {
+			newWidth = newWidth + gridX;
+		}
+		if (isMinHeight) {
+			newHeight = newHeight + gridY;
+		}
+		if (isMaxWidth) {
+			newWidth = newWidth - gridX;
+		}
+		if (isMaxHeight) {
+			newHeight = newHeight - gridY;
+		}
+
+		if (/^(se|s|e)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+		} else if (/^(ne)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.top = op.top - oy;
+		} else if (/^(sw)$/.test(a)) {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.left = op.left - ox;
+		} else {
+			that.size.width = newWidth;
+			that.size.height = newHeight;
+			that.position.top = op.top - oy;
+			that.position.left = op.left - ox;
+		}
+	}
+
+});
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.widget("ui.selectable", $.ui.mouse, {
+	version: "1.10.0",
+	options: {
+		appendTo: "body",
+		autoRefresh: true,
+		distance: 0,
+		filter: "*",
+		tolerance: "touch",
+
+		// callbacks
+		selected: null,
+		selecting: null,
+		start: null,
+		stop: null,
+		unselected: null,
+		unselecting: null
+	},
+	_create: function() {
+		var selectees,
+			that = this;
+
+		this.element.addClass("ui-selectable");
+
+		this.dragged = false;
+
+		// cache selectee children based on filter
+		this.refresh = function() {
+			selectees = $(that.options.filter, that.element[0]);
+			selectees.addClass("ui-selectee");
+			selectees.each(function() {
+				var $this = $(this),
+					pos = $this.offset();
+				$.data(this, "selectable-item", {
+					element: this,
+					$element: $this,
+					left: pos.left,
+					top: pos.top,
+					right: pos.left + $this.outerWidth(),
+					bottom: pos.top + $this.outerHeight(),
+					startselected: false,
+					selected: $this.hasClass("ui-selected"),
+					selecting: $this.hasClass("ui-selecting"),
+					unselecting: $this.hasClass("ui-unselecting")
+				});
+			});
+		};
+		this.refresh();
+
+		this.selectees = selectees.addClass("ui-selectee");
+
+		this._mouseInit();
+
+		this.helper = $("<div class='ui-selectable-helper'></div>");
+	},
+
+	_destroy: function() {
+		this.selectees
+			.removeClass("ui-selectee")
+			.removeData("selectable-item");
+		this.element
+			.removeClass("ui-selectable ui-selectable-disabled");
+		this._mouseDestroy();
+	},
+
+	_mouseStart: function(event) {
+		var that = this,
+			options = this.options;
+
+		this.opos = [event.pageX, event.pageY];
+
+		if (this.options.disabled) {
+			return;
+		}
+
+		this.selectees = $(options.filter, this.element[0]);
+
+		this._trigger("start", event);
+
+		$(options.appendTo).append(this.helper);
+		// position helper (lasso)
+		this.helper.css({
+			"left": event.pageX,
+			"top": event.pageY,
+			"width": 0,
+			"height": 0
+		});
+
+		if (options.autoRefresh) {
+			this.refresh();
+		}
+
+		this.selectees.filter(".ui-selected").each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.startselected = true;
+			if (!event.metaKey && !event.ctrlKey) {
+				selectee.$element.removeClass("ui-selected");
+				selectee.selected = false;
+				selectee.$element.addClass("ui-unselecting");
+				selectee.unselecting = true;
+				// selectable UNSELECTING callback
+				that._trigger("unselecting", event, {
+					unselecting: selectee.element
+				});
+			}
+		});
+
+		$(event.target).parents().addBack().each(function() {
+			var doSelect,
+				selectee = $.data(this, "selectable-item");
+			if (selectee) {
+				doSelect = (!event.metaKey && !event.ctrlKey) || !selectee.$element.hasClass("ui-selected");
+				selectee.$element
+					.removeClass(doSelect ? "ui-unselecting" : "ui-selected")
+					.addClass(doSelect ? "ui-selecting" : "ui-unselecting");
+				selectee.unselecting = !doSelect;
+				selectee.selecting = doSelect;
+				selectee.selected = doSelect;
+				// selectable (UN)SELECTING callback
+				if (doSelect) {
+					that._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				} else {
+					that._trigger("unselecting", event, {
+						unselecting: selectee.element
+					});
+				}
+				return false;
+			}
+		});
+
+	},
+
+	_mouseDrag: function(event) {
+
+		this.dragged = true;
+
+		if (this.options.disabled) {
+			return;
+		}
+
+		var tmp,
+			that = this,
+			options = this.options,
+			x1 = this.opos[0],
+			y1 = this.opos[1],
+			x2 = event.pageX,
+			y2 = event.pageY;
+
+		if (x1 > x2) { tmp = x2; x2 = x1; x1 = tmp; }
+		if (y1 > y2) { tmp = y2; y2 = y1; y1 = tmp; }
+		this.helper.css({left: x1, top: y1, width: x2-x1, height: y2-y1});
+
+		this.selectees.each(function() {
+			var selectee = $.data(this, "selectable-item"),
+				hit = false;
+
+			//prevent helper from being selected if appendTo: selectable
+			if (!selectee || selectee.element === that.element[0]) {
+				return;
+			}
+
+			if (options.tolerance === "touch") {
+				hit = ( !(selectee.left > x2 || selectee.right < x1 || selectee.top > y2 || selectee.bottom < y1) );
+			} else if (options.tolerance === "fit") {
+				hit = (selectee.left > x1 && selectee.right < x2 && selectee.top > y1 && selectee.bottom < y2);
+			}
+
+			if (hit) {
+				// SELECT
+				if (selectee.selected) {
+					selectee.$element.removeClass("ui-selected");
+					selectee.selected = false;
+				}
+				if (selectee.unselecting) {
+					selectee.$element.removeClass("ui-unselecting");
+					selectee.unselecting = false;
+				}
+				if (!selectee.selecting) {
+					selectee.$element.addClass("ui-selecting");
+					selectee.selecting = true;
+					// selectable SELECTING callback
+					that._trigger("selecting", event, {
+						selecting: selectee.element
+					});
+				}
+			} else {
+				// UNSELECT
+				if (selectee.selecting) {
+					if ((event.metaKey || event.ctrlKey) && selectee.startselected) {
+						selectee.$element.removeClass("ui-selecting");
+						selectee.selecting = false;
+						selectee.$element.addClass("ui-selected");
+						selectee.selected = true;
+					} else {
+						selectee.$element.removeClass("ui-selecting");
+						selectee.selecting = false;
+						if (selectee.startselected) {
+							selectee.$element.addClass("ui-unselecting");
+							selectee.unselecting = true;
+						}
+						// selectable UNSELECTING callback
+						that._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+				if (selectee.selected) {
+					if (!event.metaKey && !event.ctrlKey && !selectee.startselected) {
+						selectee.$element.removeClass("ui-selected");
+						selectee.selected = false;
+
+						selectee.$element.addClass("ui-unselecting");
+						selectee.unselecting = true;
+						// selectable UNSELECTING callback
+						that._trigger("unselecting", event, {
+							unselecting: selectee.element
+						});
+					}
+				}
+			}
+		});
+
+		return false;
+	},
+
+	_mouseStop: function(event) {
+		var that = this;
+
+		this.dragged = false;
+
+		$(".ui-unselecting", this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass("ui-unselecting");
+			selectee.unselecting = false;
+			selectee.startselected = false;
+			that._trigger("unselected", event, {
+				unselected: selectee.element
+			});
+		});
+		$(".ui-selecting", this.element[0]).each(function() {
+			var selectee = $.data(this, "selectable-item");
+			selectee.$element.removeClass("ui-selecting").addClass("ui-selected");
+			selectee.selecting = false;
+			selectee.selected = true;
+			selectee.startselected = true;
+			that._trigger("selected", event, {
+				selected: selectee.element
+			});
+		});
+		this._trigger("stop", event);
+
+		this.helper.remove();
+
+		return false;
+	}
+
+});
+
+})(jQuery);
+(function( $, undefined ) {
+
+/*jshint loopfunc: true */
+
+function isOverAxis( x, reference, size ) {
+	return ( x > reference ) && ( x < ( reference + size ) );
+}
+
+$.widget("ui.sortable", $.ui.mouse, {
+	version: "1.10.0",
+	widgetEventPrefix: "sort",
+	ready: false,
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: "> *",
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000,
+
+		// callbacks
+		activate: null,
+		beforeStop: null,
+		change: null,
+		deactivate: null,
+		out: null,
+		over: null,
+		receive: null,
+		remove: null,
+		sort: null,
+		start: null,
+		stop: null,
+		update: null
+	},
+	_create: function() {
+
+		var o = this.options;
+		this.containerCache = {};
+		this.element.addClass("ui-sortable");
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine if the items are being displayed horizontally
+		this.floating = this.items.length ? o.axis === "x" || (/left|right/).test(this.items[0].item.css("float")) || (/inline|table-cell/).test(this.items[0].item.css("display")) : false;
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+
+		//We're ready to go
+		this.ready = true;
+
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass("ui-sortable ui-sortable-disabled");
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- ) {
+			this.items[i].item.removeData(this.widgetName + "-item");
+		}
+
+		return this;
+	},
+
+	_setOption: function(key, value){
+		if ( key === "disabled" ) {
+			this.options[ key ] = value;
+
+			this.widget().toggleClass( "ui-sortable-disabled", !!value );
+		} else {
+			// Don't call widget base _setOption for disable as it adds ui-state-disabled class
+			$.Widget.prototype._setOption.apply(this, arguments);
+		}
+	},
+
+	_mouseCapture: function(event, overrideHandle) {
+		var currentItem = null,
+			validHandle = false,
+			that = this;
+
+		if (this.reverting) {
+			return false;
+		}
+
+		if(this.options.disabled || this.options.type === "static") {
+			return false;
+		}
+
+		//We have to refresh the items data once first
+		this._refreshItems(event);
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		$(event.target).parents().each(function() {
+			if($.data(this, that.widgetName + "-item") === that) {
+				currentItem = $(this);
+				return false;
+			}
+		});
+		if($.data(event.target, that.widgetName + "-item") === that) {
+			currentItem = $(event.target);
+		}
+
+		if(!currentItem) {
+			return false;
+		}
+		if(this.options.handle && !overrideHandle) {
+			$(this.options.handle, currentItem).find("*").addBack().each(function() {
+				if(this === event.target) {
+					validHandle = true;
+				}
+			});
+			if(!validHandle) {
+				return false;
+			}
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function(event, overrideHandle, noActivation) {
+
+		var i,
+			o = this.options;
+
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to mouseCapture
+		this.refreshPositions();
+
+		//Create and append the visible helper
+		this.helper = this._createHelper(event);
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.helper.scrollParent();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend(this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+			parent: this._getParentOffset(),
+			relative: this._getRelativeOffset() //This is a relative to absolute position minus the actual position calculation - only used for relative positioned helper
+		});
+
+		// Only after we got the offset, we can change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css("position", "absolute");
+		this.cssPosition = this.helper.css("position");
+
+		//Generate the original position
+		this.originalPosition = this._generatePosition(event);
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+
+		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+		(o.cursorAt && this._adjustOffsetFromHelper(o.cursorAt));
+
+		//Cache the former DOM position
+		this.domPosition = { prev: this.currentItem.prev()[0], parent: this.currentItem.parent()[0] };
+
+		//If the helper is not the original, hide the original so it's not playing any role during the drag, won't cause anything bad this way
+		if(this.helper[0] !== this.currentItem[0]) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Set a containment if given in the options
+		if(o.containment) {
+			this._setContainment();
+		}
+
+		if(o.cursor) { // cursor option
+			if ($("body").css("cursor")) {
+				this._storedCursor = $("body").css("cursor");
+			}
+			$("body").css("cursor", o.cursor);
+		}
+
+		if(o.opacity) { // opacity option
+			if (this.helper.css("opacity")) {
+				this._storedOpacity = this.helper.css("opacity");
+			}
+			this.helper.css("opacity", o.opacity);
+		}
+
+		if(o.zIndex) { // zIndex option
+			if (this.helper.css("zIndex")) {
+				this._storedZIndex = this.helper.css("zIndex");
+			}
+			this.helper.css("zIndex", o.zIndex);
+		}
+
+		//Prepare scrolling
+		if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+			this.overflowOffset = this.scrollParent.offset();
+		}
+
+		//Call callbacks
+		this._trigger("start", event, this._uiHash());
+
+		//Recache the helper size
+		if(!this._preserveHelperProportions) {
+			this._cacheHelperProportions();
+		}
+
+
+		//Post "activate" events to possible containers
+		if( !noActivation ) {
+			for ( i = this.containers.length - 1; i >= 0; i-- ) {
+				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
+			}
+		}
+
+		//Prepare possible droppables
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.current = this;
+		}
+
+		if ($.ui.ddmanager && !o.dropBehaviour) {
+			$.ui.ddmanager.prepareOffsets(this, event);
+		}
+
+		this.dragging = true;
+
+		this.helper.addClass("ui-sortable-helper");
+		this._mouseDrag(event); //Execute the drag once - this causes the helper not to be visible before getting its correct position
+		return true;
+
+	},
+
+	_mouseDrag: function(event) {
+		var i, item, itemElement, intersection,
+			o = this.options,
+			scrolled = false;
+
+		//Compute the helpers position
+		this.position = this._generatePosition(event);
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		if (!this.lastPositionAbs) {
+			this.lastPositionAbs = this.positionAbs;
+		}
+
+		//Do scrolling
+		if(this.options.scroll) {
+			if(this.scrollParent[0] !== document && this.scrollParent[0].tagName !== "HTML") {
+
+				if((this.overflowOffset.top + this.scrollParent[0].offsetHeight) - event.pageY < o.scrollSensitivity) {
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop + o.scrollSpeed;
+				} else if(event.pageY - this.overflowOffset.top < o.scrollSensitivity) {
+					this.scrollParent[0].scrollTop = scrolled = this.scrollParent[0].scrollTop - o.scrollSpeed;
+				}
+
+				if((this.overflowOffset.left + this.scrollParent[0].offsetWidth) - event.pageX < o.scrollSensitivity) {
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft + o.scrollSpeed;
+				} else if(event.pageX - this.overflowOffset.left < o.scrollSensitivity) {
+					this.scrollParent[0].scrollLeft = scrolled = this.scrollParent[0].scrollLeft - o.scrollSpeed;
+				}
+
+			} else {
+
+				if(event.pageY - $(document).scrollTop() < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() - o.scrollSpeed);
+				} else if($(window).height() - (event.pageY - $(document).scrollTop()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollTop($(document).scrollTop() + o.scrollSpeed);
+				}
+
+				if(event.pageX - $(document).scrollLeft() < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() - o.scrollSpeed);
+				} else if($(window).width() - (event.pageX - $(document).scrollLeft()) < o.scrollSensitivity) {
+					scrolled = $(document).scrollLeft($(document).scrollLeft() + o.scrollSpeed);
+				}
+
+			}
+
+			if(scrolled !== false && $.ui.ddmanager && !o.dropBehaviour) {
+				$.ui.ddmanager.prepareOffsets(this, event);
+			}
+		}
+
+		//Regenerate the absolute position used for position checks
+		this.positionAbs = this._convertPositionTo("absolute");
+
+		//Set the helper position
+		if(!this.options.axis || this.options.axis !== "y") {
+			this.helper[0].style.left = this.position.left+"px";
+		}
+		if(!this.options.axis || this.options.axis !== "x") {
+			this.helper[0].style.top = this.position.top+"px";
+		}
+
+		//Rearrange
+		for (i = this.items.length - 1; i >= 0; i--) {
+
+			//Cache variables and intersection, continue if no intersection
+			item = this.items[i];
+			itemElement = item.item[0];
+			intersection = this._intersectsWithPointer(item);
+			if (!intersection) {
+				continue;
+			}
+
+			// Only put the placeholder inside the current Container, skip all
+			// items form other containers. This works because when moving
+			// an item from one container to another the
+			// currentContainer is switched before the placeholder is moved.
+			//
+			// Without this moving items in "sub-sortables" can cause the placeholder to jitter
+			// beetween the outer and inner container.
+			if (item.instance !== this.currentContainer) {
+				continue;
+			}
+
+			// cannot intersect with itself
+			// no useless actions that have been done before
+			// no action if the item moved is the parent of the item checked
+			if (itemElement !== this.currentItem[0] &&
+				this.placeholder[intersection === 1 ? "next" : "prev"]()[0] !== itemElement &&
+				!$.contains(this.placeholder[0], itemElement) &&
+				(this.options.type === "semi-dynamic" ? !$.contains(this.element[0], itemElement) : true)
+			) {
+
+				this.direction = intersection === 1 ? "down" : "up";
+
+				if (this.options.tolerance === "pointer" || this._intersectsWithSides(item)) {
+					this._rearrange(event, item);
+				} else {
+					break;
+				}
+
+				this._trigger("change", event, this._uiHash());
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers(event);
+
+		//Interconnect with droppables
+		if($.ui.ddmanager) {
+			$.ui.ddmanager.drag(this, event);
+		}
+
+		//Call callbacks
+		this._trigger("sort", event, this._uiHash());
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function(event, noPropagation) {
+
+		if(!event) {
+			return;
+		}
+
+		//If we are using droppables, inform the manager about the drop
+		if ($.ui.ddmanager && !this.options.dropBehaviour) {
+			$.ui.ddmanager.drop(this, event);
+		}
+
+		if(this.options.revert) {
+			var that = this,
+				cur = this.placeholder.offset();
+
+			this.reverting = true;
+
+			$(this.helper).animate({
+				left: cur.left - this.offset.parent.left - this.margins.left + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollLeft),
+				top: cur.top - this.offset.parent.top - this.margins.top + (this.offsetParent[0] === document.body ? 0 : this.offsetParent[0].scrollTop)
+			}, parseInt(this.options.revert, 10) || 500, function() {
+				that._clear(event);
+			});
+		} else {
+			this._clear(event, noPropagation);
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		if(this.dragging) {
+
+			this._mouseUp({ target: null });
+
+			if(this.options.helper === "original") {
+				this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+			} else {
+				this.currentItem.show();
+			}
+
+			//Post deactivating events to containers
+			for (var i = this.containers.length - 1; i >= 0; i--){
+				this.containers[i]._trigger("deactivate", null, this._uiHash(this));
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", null, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if (this.placeholder) {
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+			if(this.placeholder[0].parentNode) {
+				this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+			}
+			if(this.options.helper !== "original" && this.helper && this.helper[0].parentNode) {
+				this.helper.remove();
+			}
+
+			$.extend(this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			});
+
+			if(this.domPosition.prev) {
+				$(this.domPosition.prev).after(this.currentItem);
+			} else {
+				$(this.domPosition.parent).prepend(this.currentItem);
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected),
+			str = [];
+		o = o || {};
+
+		$(items).each(function() {
+			var res = ($(o.item || this).attr(o.attribute || "id") || "").match(o.expression || (/(.+)[\-=_](.+)/));
+			if (res) {
+				str.push((o.key || res[1]+"[]")+"="+(o.key && o.expression ? res[1] : res[2]));
+			}
+		});
+
+		if(!str.length && o.key) {
+			str.push(o.key + "=");
+		}
+
+		return str.join("&");
+
+	},
+
+	toArray: function(o) {
+
+		var items = this._getItemsAsjQuery(o && o.connected),
+			ret = [];
+
+		o = o || {};
+
+		items.each(function() { ret.push($(o.item || this).attr(o.attribute || "id") || ""); });
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function(item) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height,
+			l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height,
+			dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left,
+			isOverElement = (y1 + dyClick) > t && (y1 + dyClick) < b && (x1 + dxClick) > l && (x1 + dxClick) < r;
+
+		if ( this.options.tolerance === "pointer" ||
+			this.options.forcePointerForContainers ||
+			(this.options.tolerance !== "pointer" && this.helperProportions[this.floating ? "width" : "height"] > item[this.floating ? "width" : "height"])
+		) {
+			return isOverElement;
+		} else {
+
+			return (l < x1 + (this.helperProportions.width / 2) && // Right Half
+				x2 - (this.helperProportions.width / 2) < r && // Left Half
+				t < y1 + (this.helperProportions.height / 2) && // Bottom Half
+				y2 - (this.helperProportions.height / 2) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function(item) {
+
+		var isOverElementHeight = (this.options.axis === "x") || isOverAxis(this.positionAbs.top + this.offset.click.top, item.top, item.height),
+			isOverElementWidth = (this.options.axis === "y") || isOverAxis(this.positionAbs.left + this.offset.click.left, item.left, item.width),
+			isOverElement = isOverElementHeight && isOverElementWidth,
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (!isOverElement) {
+			return false;
+		}
+
+		return this.floating ?
+			( ((horizontalDirection && horizontalDirection === "right") || verticalDirection === "down") ? 2 : 1 )
+			: ( verticalDirection && (verticalDirection === "down" ? 2 : 1) );
+
+	},
+
+	_intersectsWithSides: function(item) {
+
+		var isOverBottomHalf = isOverAxis(this.positionAbs.top + this.offset.click.top, item.top + (item.height/2), item.height),
+			isOverRightHalf = isOverAxis(this.positionAbs.left + this.offset.click.left, item.left + (item.width/2), item.width),
+			verticalDirection = this._getDragVerticalDirection(),
+			horizontalDirection = this._getDragHorizontalDirection();
+
+		if (this.floating && horizontalDirection) {
+			return ((horizontalDirection === "right" && isOverRightHalf) || (horizontalDirection === "left" && !isOverRightHalf));
+		} else {
+			return verticalDirection && ((verticalDirection === "down" && isOverBottomHalf) || (verticalDirection === "up" && !isOverBottomHalf));
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta !== 0 && (delta > 0 ? "down" : "up");
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta !== 0 && (delta > 0 ? "right" : "left");
+	},
+
+	refresh: function(event) {
+		this._refreshItems(event);
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor === String ? [options.connectWith] : options.connectWith;
+	},
+
+	_getItemsAsjQuery: function(connected) {
+
+		var i, j, cur, inst,
+			items = [],
+			queries = [],
+			connectWith = this._connectWith();
+
+		if(connectWith && connected) {
+			for (i = connectWith.length - 1; i >= 0; i--){
+				cur = $(connectWith[i]);
+				for ( j = cur.length - 1; j >= 0; j--){
+					inst = $.data(cur[j], this.widgetFullName);
+					if(inst && inst !== this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element) : $(inst.options.items, inst.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), inst]);
+					}
+				}
+			}
+		}
+
+		queries.push([$.isFunction(this.options.items) ? this.options.items.call(this.element, null, { options: this.options, item: this.currentItem }) : $(this.options.items, this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"), this]);
+
+		for (i = queries.length - 1; i >= 0; i--){
+			queries[i][0].each(function() {
+				items.push(this);
+			});
+		}
+
+		return $(items);
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find(":data(" + this.widgetName + "-item)");
+
+		this.items = $.grep(this.items, function (item) {
+			for (var j=0; j < list.length; j++) {
+				if(list[j] === item.item[0]) {
+					return false;
+				}
+			}
+			return true;
+		});
+
+	},
+
+	_refreshItems: function(event) {
+
+		this.items = [];
+		this.containers = [this];
+
+		var i, j, cur, inst, targetData, _queries, item, queriesLength,
+			items = this.items,
+			queries = [[$.isFunction(this.options.items) ? this.options.items.call(this.element[0], event, { item: this.currentItem }) : $(this.options.items, this.element), this]],
+			connectWith = this._connectWith();
+
+		if(connectWith && this.ready) { //Shouldn't be run the first time through due to massive slow-down
+			for (i = connectWith.length - 1; i >= 0; i--){
+				cur = $(connectWith[i]);
+				for (j = cur.length - 1; j >= 0; j--){
+					inst = $.data(cur[j], this.widgetFullName);
+					if(inst && inst !== this && !inst.options.disabled) {
+						queries.push([$.isFunction(inst.options.items) ? inst.options.items.call(inst.element[0], event, { item: this.currentItem }) : $(inst.options.items, inst.element), inst]);
+						this.containers.push(inst);
+					}
+				}
+			}
+		}
+
+		for (i = queries.length - 1; i >= 0; i--) {
+			targetData = queries[i][1];
+			_queries = queries[i][0];
+
+			for (j=0, queriesLength = _queries.length; j < queriesLength; j++) {
+				item = $(_queries[j]);
+
+				item.data(this.widgetName + "-item", targetData); // Data for target checking (mouse manager)
+
+				items.push({
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				});
+			}
+		}
+
+	},
+
+	refreshPositions: function(fast) {
+
+		//This has to be redone because due to the item being moved out/into the offsetParent, the offsetParent's position will change
+		if(this.offsetParent && this.helper) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		var i, item, t, p;
+
+		for (i = this.items.length - 1; i >= 0; i--){
+			item = this.items[i];
+
+			//We ignore calculating positions of all connected containers when we're not over them
+			if(item.instance !== this.currentContainer && this.currentContainer && item.item[0] !== this.currentItem[0]) {
+				continue;
+			}
+
+			t = this.options.toleranceElement ? $(this.options.toleranceElement, item.item) : item.item;
+
+			if (!fast) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		}
+
+		if(this.options.custom && this.options.custom.refreshContainers) {
+			this.options.custom.refreshContainers.call(this);
+		} else {
+			for (i = this.containers.length - 1; i >= 0; i--){
+				p = this.containers[i].element.offset();
+				this.containers[i].containerCache.left = p.left;
+				this.containers[i].containerCache.top = p.top;
+				this.containers[i].containerCache.width	= this.containers[i].element.outerWidth();
+				this.containers[i].containerCache.height = this.containers[i].element.outerHeight();
+			}
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function(that) {
+		that = that || this;
+		var className,
+			o = that.options;
+
+		if(!o.placeholder || o.placeholder.constructor === String) {
+			className = o.placeholder;
+			o.placeholder = {
+				element: function() {
+
+					var el = $(document.createElement(that.currentItem[0].nodeName))
+						.addClass(className || that.currentItem[0].className+" ui-sortable-placeholder")
+						.removeClass("ui-sortable-helper")[0];
+
+					if(!className) {
+						el.style.visibility = "hidden";
+					}
+
+					return el;
+				},
+				update: function(container, p) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes - the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a class name is specified
+					if(className && !o.forcePlaceholderSize) {
+						return;
+					}
+
+					//If the element doesn't have a actual height by itself (without styles coming from a stylesheet), it receives the inline height from the dragged item
+					if(!p.height()) { p.height(that.currentItem.innerHeight() - parseInt(that.currentItem.css("paddingTop")||0, 10) - parseInt(that.currentItem.css("paddingBottom")||0, 10)); }
+					if(!p.width()) { p.width(that.currentItem.innerWidth() - parseInt(that.currentItem.css("paddingLeft")||0, 10) - parseInt(that.currentItem.css("paddingRight")||0, 10)); }
+				}
+			};
+		}
+
+		//Create the placeholder
+		that.placeholder = $(o.placeholder.element.call(that.element, that.currentItem));
+
+		//Append it after the actual current item
+		that.currentItem.after(that.placeholder);
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update(that, that.placeholder);
+
+	},
+
+	_contactContainers: function(event) {
+		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, base, cur, nearBottom,
+			innermostContainer = null,
+			innermostIndex = null;
+
+		// get innermost container that intersects with item
+		for (i = this.containers.length - 1; i >= 0; i--) {
+
+			// never consider a container that's located within the item itself
+			if($.contains(this.currentItem[0], this.containers[i].element[0])) {
+				continue;
+			}
+
+			if(this._intersectsWith(this.containers[i].containerCache)) {
+
+				// if we've already found a container and it's more "inner" than this, then continue
+				if(innermostContainer && $.contains(this.containers[i].element[0], innermostContainer.element[0])) {
+					continue;
+				}
+
+				innermostContainer = this.containers[i];
+				innermostIndex = i;
+
+			} else {
+				// container doesn't intersect. trigger "out" event if necessary
+				if(this.containers[i].containerCache.over) {
+					this.containers[i]._trigger("out", event, this._uiHash(this));
+					this.containers[i].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		// if no intersecting containers found, return
+		if(!innermostContainer) {
+			return;
+		}
+
+		// move the item into the container if it's not there already
+		if(this.containers.length === 1) {
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		} else {
+
+			//When entering a new container, we will find the item with the least distance and append our item near it
+			dist = 10000;
+			itemWithLeastDistance = null;
+			posProperty = this.containers[innermostIndex].floating ? "left" : "top";
+			sizeProperty = this.containers[innermostIndex].floating ? "width" : "height";
+			base = this.positionAbs[posProperty] + this.offset.click[posProperty];
+			for (j = this.items.length - 1; j >= 0; j--) {
+				if(!$.contains(this.containers[innermostIndex].element[0], this.items[j].item[0])) {
+					continue;
+				}
+				if(this.items[j].item[0] === this.currentItem[0]) {
+					continue;
+				}
+				cur = this.items[j].item.offset()[posProperty];
+				nearBottom = false;
+				if(Math.abs(cur - base) > Math.abs(cur + this.items[j][sizeProperty] - base)){
+					nearBottom = true;
+					cur += this.items[j][sizeProperty];
+				}
+
+				if(Math.abs(cur - base) < dist) {
+					dist = Math.abs(cur - base); itemWithLeastDistance = this.items[j];
+					this.direction = nearBottom ? "up": "down";
+				}
+			}
+
+			//Check if dropOnEmpty is enabled
+			if(!itemWithLeastDistance && !this.options.dropOnEmpty) {
+				return;
+			}
+
+			this.currentContainer = this.containers[innermostIndex];
+			itemWithLeastDistance ? this._rearrange(event, itemWithLeastDistance, null, true) : this._rearrange(event, null, this.containers[innermostIndex].element, true);
+			this._trigger("change", event, this._uiHash());
+			this.containers[innermostIndex]._trigger("change", event, this._uiHash(this));
+
+			//Update the placeholder
+			this.options.placeholder.update(this.currentContainer, this.placeholder);
+
+			this.containers[innermostIndex]._trigger("over", event, this._uiHash(this));
+			this.containers[innermostIndex].containerCache.over = 1;
+		}
+
+
+	},
+
+	_createHelper: function(event) {
+
+		var o = this.options,
+			helper = $.isFunction(o.helper) ? $(o.helper.apply(this.element[0], [event, this.currentItem])) : (o.helper === "clone" ? this.currentItem.clone() : this.currentItem);
+
+		//Add the helper to the DOM if that didn't happen already
+		if(!helper.parents("body").length) {
+			$(o.appendTo !== "parent" ? o.appendTo : this.currentItem[0].parentNode)[0].appendChild(helper[0]);
+		}
+
+		if(helper[0] === this.currentItem[0]) {
+			this._storedCSS = { width: this.currentItem[0].style.width, height: this.currentItem[0].style.height, position: this.currentItem.css("position"), top: this.currentItem.css("top"), left: this.currentItem.css("left") };
+		}
+
+		if(!helper[0].style.width || o.forceHelperSize) {
+			helper.width(this.currentItem.width());
+		}
+		if(!helper[0].style.height || o.forceHelperSize) {
+			helper.height(this.currentItem.height());
+		}
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function(obj) {
+		if (typeof obj === "string") {
+			obj = obj.split(" ");
+		}
+		if ($.isArray(obj)) {
+			obj = {left: +obj[0], top: +obj[1] || 0};
+		}
+		if ("left" in obj) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ("right" in obj) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ("top" in obj) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ("bottom" in obj) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't the document, which means that
+		//    the scroll is included in the initial calculation of the offset of the parent, and never recalculated upon drag
+		if(this.cssPosition === "absolute" && this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		// This needs to be actually done for all browsers, since pageX/pageY includes this information
+		// with an ugly IE fix
+		if( this.offsetParent[0] === document.body || (this.offsetParent[0].tagName && this.offsetParent[0].tagName.toLowerCase() === "html" && $.ui.ie)) {
+			po = { top: 0, left: 0 };
+		}
+
+		return {
+			top: po.top + (parseInt(this.offsetParent.css("borderTopWidth"),10) || 0),
+			left: po.left + (parseInt(this.offsetParent.css("borderLeftWidth"),10) || 0)
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if(this.cssPosition === "relative") {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - (parseInt(this.helper.css("top"),10) || 0) + this.scrollParent.scrollTop(),
+				left: p.left - (parseInt(this.helper.css("left"),10) || 0) + this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: (parseInt(this.currentItem.css("marginLeft"),10) || 0),
+			top: (parseInt(this.currentItem.css("marginTop"),10) || 0)
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var ce, co, over,
+			o = this.options;
+		if(o.containment === "parent") {
+			o.containment = this.helper[0].parentNode;
+		}
+		if(o.containment === "document" || o.containment === "window") {
+			this.containment = [
+				0 - this.offset.relative.left - this.offset.parent.left,
+				0 - this.offset.relative.top - this.offset.parent.top,
+				$(o.containment === "document" ? document : window).width() - this.helperProportions.width - this.margins.left,
+				($(o.containment === "document" ? document : window).height() || document.body.parentNode.scrollHeight) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+		if(!(/^(document|window|parent)$/).test(o.containment)) {
+			ce = $(o.containment)[0];
+			co = $(o.containment).offset();
+			over = ($(ce).css("overflow") !== "hidden");
+
+			this.containment = [
+				co.left + (parseInt($(ce).css("borderLeftWidth"),10) || 0) + (parseInt($(ce).css("paddingLeft"),10) || 0) - this.margins.left,
+				co.top + (parseInt($(ce).css("borderTopWidth"),10) || 0) + (parseInt($(ce).css("paddingTop"),10) || 0) - this.margins.top,
+				co.left+(over ? Math.max(ce.scrollWidth,ce.offsetWidth) : ce.offsetWidth) - (parseInt($(ce).css("borderLeftWidth"),10) || 0) - (parseInt($(ce).css("paddingRight"),10) || 0) - this.helperProportions.width - this.margins.left,
+				co.top+(over ? Math.max(ce.scrollHeight,ce.offsetHeight) : ce.offsetHeight) - (parseInt($(ce).css("borderTopWidth"),10) || 0) - (parseInt($(ce).css("paddingBottom"),10) || 0) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function(d, pos) {
+
+		if(!pos) {
+			pos = this.position;
+		}
+		var mod = d === "absolute" ? 1 : -1,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent,
+			scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		return {
+			top: (
+				pos.top	+																// The absolute mouse position
+				this.offset.relative.top * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top * mod -											// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod)
+			),
+			left: (
+				pos.left +																// The absolute mouse position
+				this.offset.relative.left * mod +										// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left * mod	-										// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ) * mod)
+			)
+		};
+
+	},
+
+	_generatePosition: function(event) {
+
+		var top, left,
+			o = this.options,
+			pageX = event.pageX,
+			pageY = event.pageY,
+			scroll = this.cssPosition === "absolute" && !(this.scrollParent[0] !== document && $.contains(this.scrollParent[0], this.offsetParent[0])) ? this.offsetParent : this.scrollParent, scrollIsRootNode = (/(html|body)/i).test(scroll[0].tagName);
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if(this.cssPosition === "relative" && !(this.scrollParent[0] !== document && this.scrollParent[0] !== this.offsetParent[0])) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if(this.originalPosition) { //If we are not dragging yet, we won't check for options
+
+			if(this.containment) {
+				if(event.pageX - this.offset.click.left < this.containment[0]) {
+					pageX = this.containment[0] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top < this.containment[1]) {
+					pageY = this.containment[1] + this.offset.click.top;
+				}
+				if(event.pageX - this.offset.click.left > this.containment[2]) {
+					pageX = this.containment[2] + this.offset.click.left;
+				}
+				if(event.pageY - this.offset.click.top > this.containment[3]) {
+					pageY = this.containment[3] + this.offset.click.top;
+				}
+			}
+
+			if(o.grid) {
+				top = this.originalPageY + Math.round((pageY - this.originalPageY) / o.grid[1]) * o.grid[1];
+				pageY = this.containment ? ( (top - this.offset.click.top >= this.containment[1] && top - this.offset.click.top <= this.containment[3]) ? top : ((top - this.offset.click.top >= this.containment[1]) ? top - o.grid[1] : top + o.grid[1])) : top;
+
+				left = this.originalPageX + Math.round((pageX - this.originalPageX) / o.grid[0]) * o.grid[0];
+				pageX = this.containment ? ( (left - this.offset.click.left >= this.containment[0] && left - this.offset.click.left <= this.containment[2]) ? left : ((left - this.offset.click.left >= this.containment[0]) ? left - o.grid[0] : left + o.grid[0])) : left;
+			}
+
+		}
+
+		return {
+			top: (
+				pageY -																// The absolute mouse position
+				this.offset.click.top -													// Click offset (relative to the element)
+				this.offset.relative.top	-											// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.top +												// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollTop() : ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ))
+			),
+			left: (
+				pageX -																// The absolute mouse position
+				this.offset.click.left -												// Click offset (relative to the element)
+				this.offset.relative.left	-											// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.parent.left +												// The offsetParent's offset without borders (offset + border)
+				( ( this.cssPosition === "fixed" ? -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : scroll.scrollLeft() ))
+			)
+		};
+
+	},
+
+	_rearrange: function(event, i, a, hardRefresh) {
+
+		a ? a[0].appendChild(this.placeholder[0]) : i.item[0].parentNode.insertBefore(this.placeholder[0], (this.direction === "down" ? i.item[0] : i.item[0].nextSibling));
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout, if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var counter = this.counter;
+
+		this._delay(function() {
+			if(counter === this.counter) {
+				this.refreshPositions(!hardRefresh); //Precompute after each DOM insertion, NOT on mousemove
+			}
+		});
+
+	},
+
+	_clear: function(event, noPropagation) {
+
+		this.reverting = false;
+		// We delay all events that have to be triggered to after the point where the placeholder has been removed and
+		// everything else normalized again
+		var i,
+			delayedTriggers = [];
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets reappended (see #4088)
+		if(!this._noFinalSort && this.currentItem.parent().length) {
+			this.placeholder.before(this.currentItem);
+		}
+		this._noFinalSort = null;
+
+		if(this.helper[0] === this.currentItem[0]) {
+			for(i in this._storedCSS) {
+				if(this._storedCSS[i] === "auto" || this._storedCSS[i] === "static") {
+					this._storedCSS[i] = "";
+				}
+			}
+			this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper");
+		} else {
+			this.currentItem.show();
+		}
+
+		if(this.fromOutside && !noPropagation) {
+			delayedTriggers.push(function(event) { this._trigger("receive", event, this._uiHash(this.fromOutside)); });
+		}
+		if((this.fromOutside || this.domPosition.prev !== this.currentItem.prev().not(".ui-sortable-helper")[0] || this.domPosition.parent !== this.currentItem.parent()[0]) && !noPropagation) {
+			delayedTriggers.push(function(event) { this._trigger("update", event, this._uiHash()); }); //Trigger update callback if the DOM position has changed
+		}
+
+		// Check if the items Container has Changed and trigger appropriate
+		// events.
+		if (this !== this.currentContainer) {
+			if(!noPropagation) {
+				delayedTriggers.push(function(event) { this._trigger("remove", event, this._uiHash()); });
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("receive", event, this._uiHash(this)); };  }).call(this, this.currentContainer));
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("update", event, this._uiHash(this));  }; }).call(this, this.currentContainer));
+			}
+		}
+
+
+		//Post events to containers
+		for (i = this.containers.length - 1; i >= 0; i--){
+			if(!noPropagation) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("deactivate", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+			}
+			if(this.containers[i].containerCache.over) {
+				delayedTriggers.push((function(c) { return function(event) { c._trigger("out", event, this._uiHash(this)); };  }).call(this, this.containers[i]));
+				this.containers[i].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if(this._storedCursor) {
+			$("body").css("cursor", this._storedCursor);
+		}
+		if(this._storedOpacity) {
+			this.helper.css("opacity", this._storedOpacity);
+		}
+		if(this._storedZIndex) {
+			this.helper.css("zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex);
+		}
+
+		this.dragging = false;
+		if(this.cancelHelperRemoval) {
+			if(!noPropagation) {
+				this._trigger("beforeStop", event, this._uiHash());
+				for (i=0; i < delayedTriggers.length; i++) {
+					delayedTriggers[i].call(this, event);
+				} //Trigger all delayed events
+				this._trigger("stop", event, this._uiHash());
+			}
+
+			this.fromOutside = false;
+			return false;
+		}
+
+		if(!noPropagation) {
+			this._trigger("beforeStop", event, this._uiHash());
+		}
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, it unbinds ALL events from the original node!
+		this.placeholder[0].parentNode.removeChild(this.placeholder[0]);
+
+		if(this.helper[0] !== this.currentItem[0]) {
+			this.helper.remove();
+		}
+		this.helper = null;
+
+		if(!noPropagation) {
+			for (i=0; i < delayedTriggers.length; i++) {
+				delayedTriggers[i].call(this, event);
+			} //Trigger all delayed events
+			this._trigger("stop", event, this._uiHash());
+		}
+
+		this.fromOutside = false;
+		return true;
+
+	},
+
+	_trigger: function() {
+		if ($.Widget.prototype._trigger.apply(this, arguments) === false) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function(_inst) {
+		var inst = _inst || this;
+		return {
+			helper: inst.helper,
+			placeholder: inst.placeholder || $([]),
+			position: inst.position,
+			originalPosition: inst.originalPosition,
+			offset: inst.positionAbs,
+			item: inst.currentItem,
+			sender: _inst ? _inst.element : null
+		};
+	}
+
+});
+
+})(jQuery);
+(function( $, undefined ) {
+
+var uid = 0,
+	hideProps = {},
+	showProps = {};
+
+hideProps.height = hideProps.paddingTop = hideProps.paddingBottom =
+	hideProps.borderTopWidth = hideProps.borderBottomWidth = "hide";
+showProps.height = showProps.paddingTop = showProps.paddingBottom =
+	showProps.borderTopWidth = showProps.borderBottomWidth = "show";
+
+$.widget( "ui.accordion", {
+	version: "1.10.0",
+	options: {
+		active: 0,
+		animate: {},
+		collapsible: false,
+		event: "click",
+		header: "> li > :first-child,> :not(li):even",
+		heightStyle: "auto",
+		icons: {
+			activeHeader: "ui-icon-triangle-1-s",
+			header: "ui-icon-triangle-1-e"
+		},
+
+		// callbacks
+		activate: null,
+		beforeActivate: null
+	},
+
+	_create: function() {
+		var options = this.options;
+		this.prevShow = this.prevHide = $();
+		this.element.addClass( "ui-accordion ui-widget ui-helper-reset" )
+			// ARIA
+			.attr( "role", "tablist" );
+
+		// don't allow collapsible: false and active: false / null
+		if ( !options.collapsible && (options.active === false || options.active == null) ) {
+			options.active = 0;
+		}
+
+		this._processPanels();
+		// handle negative values
+		if ( options.active < 0 ) {
+			options.active += this.headers.length;
+		}
+		this._refresh();
+	},
+
+	_getCreateEventData: function() {
+		return {
+			header: this.active,
+			content: !this.active.length ? $() : this.active.next()
+		};
+	},
+
+	_createIcons: function() {
+		var icons = this.options.icons;
+		if ( icons ) {
+			$( "<span>" )
+				.addClass( "ui-accordion-header-icon ui-icon " + icons.header )
+				.prependTo( this.headers );
+			this.active.children( ".ui-accordion-header-icon" )
+				.removeClass( icons.header )
+				.addClass( icons.activeHeader );
+			this.headers.addClass( "ui-accordion-icons" );
+		}
+	},
+
+	_destroyIcons: function() {
+		this.headers
+			.removeClass( "ui-accordion-icons" )
+			.children( ".ui-accordion-header-icon" )
+				.remove();
+	},
+
+	_destroy: function() {
+		var contents;
+
+		// clean up main element
+		this.element
+			.removeClass( "ui-accordion ui-widget ui-helper-reset" )
+			.removeAttr( "role" );
+
+		// clean up headers
+		this.headers
+			.removeClass( "ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-selected" )
+			.removeAttr( "aria-controls" )
+			.removeAttr( "tabIndex" )
+			.each(function() {
+				if ( /^ui-accordion/.test( this.id ) ) {
+					this.removeAttribute( "id" );
+				}
+			});
+		this._destroyIcons();
+
+		// clean up content panels
+		contents = this.headers.next()
+			.css( "display", "" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-expanded" )
+			.removeAttr( "aria-hidden" )
+			.removeAttr( "aria-labelledby" )
+			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled" )
+			.each(function() {
+				if ( /^ui-accordion/.test( this.id ) ) {
+					this.removeAttribute( "id" );
+				}
+			});
+		if ( this.options.heightStyle !== "content" ) {
+			contents.css( "height", "" );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "active" ) {
+			// _activate() will handle invalid values and update this.options
+			this._activate( value );
+			return;
+		}
+
+		if ( key === "event" ) {
+			if ( this.options.event ) {
+				this._off( this.headers, this.options.event );
+			}
+			this._setupEvents( value );
+		}
+
+		this._super( key, value );
+
+		// setting collapsible: false while collapsed; open first panel
+		if ( key === "collapsible" && !value && this.options.active === false ) {
+			this._activate( 0 );
+		}
+
+		if ( key === "icons" ) {
+			this._destroyIcons();
+			if ( value ) {
+				this._createIcons();
+			}
+		}
+
+		// #5332 - opacity doesn't cascade to positioned elements in IE
+		// so we need to add the disabled class to the headers and panels
+		if ( key === "disabled" ) {
+			this.headers.add( this.headers.next() )
+				.toggleClass( "ui-state-disabled", !!value );
+		}
+	},
+
+	_keydown: function( event ) {
+		/*jshint maxcomplexity:15*/
+		if ( event.altKey || event.ctrlKey ) {
+			return;
+		}
+
+		var keyCode = $.ui.keyCode,
+			length = this.headers.length,
+			currentIndex = this.headers.index( event.target ),
+			toFocus = false;
+
+		switch ( event.keyCode ) {
+			case keyCode.RIGHT:
+			case keyCode.DOWN:
+				toFocus = this.headers[ ( currentIndex + 1 ) % length ];
+				break;
+			case keyCode.LEFT:
+			case keyCode.UP:
+				toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
+				break;
+			case keyCode.SPACE:
+			case keyCode.ENTER:
+				this._eventHandler( event );
+				break;
+			case keyCode.HOME:
+				toFocus = this.headers[ 0 ];
+				break;
+			case keyCode.END:
+				toFocus = this.headers[ length - 1 ];
+				break;
+		}
+
+		if ( toFocus ) {
+			$( event.target ).attr( "tabIndex", -1 );
+			$( toFocus ).attr( "tabIndex", 0 );
+			toFocus.focus();
+			event.preventDefault();
+		}
+	},
+
+	_panelKeyDown : function( event ) {
+		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
+			$( event.currentTarget ).prev().focus();
+		}
+	},
+
+	refresh: function() {
+		var options = this.options;
+		this._processPanels();
+
+		// was collapsed or no panel
+		if ( ( options.active === false && options.collapsible === true ) || !this.headers.length ) {
+			options.active = false;
+			this.active = $();
+		// active false only when collapsible is true
+		} if ( options.active === false ) {
+			this._activate( 0 );
+		// was active, but active panel is gone
+		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+			// all remaining panel are disabled
+			if ( this.headers.length === this.headers.find(".ui-state-disabled").length ) {
+				options.active = false;
+				this.active = $();
+			// activate previous panel
+			} else {
+				this._activate( Math.max( 0, options.active - 1 ) );
+			}
+		// was active, active panel still exists
+		} else {
+			// make sure active index is correct
+			options.active = this.headers.index( this.active );
+		}
+
+		this._destroyIcons();
+
+		this._refresh();
+	},
+
+	_processPanels: function() {
+		this.headers = this.element.find( this.options.header )
+			.addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" );
+
+		this.headers.next()
+			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
+			.filter(":not(.ui-accordion-content-active)")
+			.hide();
+	},
+
+	_refresh: function() {
+		var maxHeight,
+			options = this.options,
+			heightStyle = options.heightStyle,
+			parent = this.element.parent(),
+			accordionId = this.accordionId = "ui-accordion-" +
+				(this.element.attr( "id" ) || ++uid);
+
+		this.active = this._findActive( options.active )
+			.addClass( "ui-accordion-header-active ui-state-active" )
+			.toggleClass( "ui-corner-all ui-corner-top" );
+		this.active.next()
+			.addClass( "ui-accordion-content-active" )
+			.show();
+
+		this.headers
+			.attr( "role", "tab" )
+			.each(function( i ) {
+				var header = $( this ),
+					headerId = header.attr( "id" ),
+					panel = header.next(),
+					panelId = panel.attr( "id" );
+				if ( !headerId ) {
+					headerId = accordionId + "-header-" + i;
+					header.attr( "id", headerId );
+				}
+				if ( !panelId ) {
+					panelId = accordionId + "-panel-" + i;
+					panel.attr( "id", panelId );
+				}
+				header.attr( "aria-controls", panelId );
+				panel.attr( "aria-labelledby", headerId );
+			})
+			.next()
+				.attr( "role", "tabpanel" );
+
+		this.headers
+			.not( this.active )
+			.attr({
+				"aria-selected": "false",
+				tabIndex: -1
+			})
+			.next()
+				.attr({
+					"aria-expanded": "false",
+					"aria-hidden": "true"
+				})
+				.hide();
+
+		// make sure at least one header is in the tab order
+		if ( !this.active.length ) {
+			this.headers.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			this.active.attr({
+				"aria-selected": "true",
+				tabIndex: 0
+			})
+			.next()
+				.attr({
+					"aria-expanded": "true",
+					"aria-hidden": "false"
+				});
+		}
+
+		this._createIcons();
+
+		this._setupEvents( options.event );
+
+		if ( heightStyle === "fill" ) {
+			maxHeight = parent.height();
+			this.element.siblings( ":visible" ).each(function() {
+				var elem = $( this ),
+					position = elem.css( "position" );
+
+				if ( position === "absolute" || position === "fixed" ) {
+					return;
+				}
+				maxHeight -= elem.outerHeight( true );
+			});
+
+			this.headers.each(function() {
+				maxHeight -= $( this ).outerHeight( true );
+			});
+
+			this.headers.next()
+				.each(function() {
+					$( this ).height( Math.max( 0, maxHeight -
+						$( this ).innerHeight() + $( this ).height() ) );
+				})
+				.css( "overflow", "auto" );
+		} else if ( heightStyle === "auto" ) {
+			maxHeight = 0;
+			this.headers.next()
+				.each(function() {
+					maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() );
+				})
+				.height( maxHeight );
+		}
+	},
+
+	_activate: function( index ) {
+		var active = this._findActive( index )[ 0 ];
+
+		// trying to activate the already active panel
+		if ( active === this.active[ 0 ] ) {
+			return;
+		}
+
+		// trying to collapse, simulate a click on the currently active header
+		active = active || this.active[ 0 ];
+
+		this._eventHandler({
+			target: active,
+			currentTarget: active,
+			preventDefault: $.noop
+		});
+	},
+
+	_findActive: function( selector ) {
+		return typeof selector === "number" ? this.headers.eq( selector ) : $();
+	},
+
+	_setupEvents: function( event ) {
+		var events = {
+			keydown: "_keydown"
+		};
+		if ( event ) {
+			$.each( event.split(" "), function( index, eventName ) {
+				events[ eventName ] = "_eventHandler";
+			});
+		}
+
+		this._off( this.headers.add( this.headers.next() ) );
+		this._on( this.headers, events );
+		this._on( this.headers.next(), { keydown: "_panelKeyDown" });
+		this._hoverable( this.headers );
+		this._focusable( this.headers );
+	},
+
+	_eventHandler: function( event ) {
+		var options = this.options,
+			active = this.active,
+			clicked = $( event.currentTarget ),
+			clickedIsActive = clicked[ 0 ] === active[ 0 ],
+			collapsing = clickedIsActive && options.collapsible,
+			toShow = collapsing ? $() : clicked.next(),
+			toHide = active.next(),
+			eventData = {
+				oldHeader: active,
+				oldPanel: toHide,
+				newHeader: collapsing ? $() : clicked,
+				newPanel: toShow
+			};
+
+		event.preventDefault();
+
+		if (
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+			return;
+		}
+
+		options.active = collapsing ? false : this.headers.index( clicked );
+
+		// when the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
+		this.active = clickedIsActive ? $() : clicked;
+		this._toggle( eventData );
+
+		// switch classes
+		// corner classes on the previously active header stay after the animation
+		active.removeClass( "ui-accordion-header-active ui-state-active" );
+		if ( options.icons ) {
+			active.children( ".ui-accordion-header-icon" )
+				.removeClass( options.icons.activeHeader )
+				.addClass( options.icons.header );
+		}
+
+		if ( !clickedIsActive ) {
+			clicked
+				.removeClass( "ui-corner-all" )
+				.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" );
+			if ( options.icons ) {
+				clicked.children( ".ui-accordion-header-icon" )
+					.removeClass( options.icons.header )
+					.addClass( options.icons.activeHeader );
+			}
+
+			clicked
+				.next()
+				.addClass( "ui-accordion-content-active" );
+		}
+	},
+
+	_toggle: function( data ) {
+		var toShow = data.newPanel,
+			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
+
+		// handle activating a panel during the animation for another activation
+		this.prevShow.add( this.prevHide ).stop( true, true );
+		this.prevShow = toShow;
+		this.prevHide = toHide;
+
+		if ( this.options.animate ) {
+			this._animate( toShow, toHide, data );
+		} else {
+			toHide.hide();
+			toShow.show();
+			this._toggleComplete( data );
+		}
+
+		toHide.attr({
+			"aria-expanded": "false",
+			"aria-hidden": "true"
+		});
+		toHide.prev().attr( "aria-selected", "false" );
+		// if we're switching panels, remove the old header from the tab order
+		// if we're opening from collapsed state, remove the previous header from the tab order
+		// if we're collapsing, then keep the collapsing header in the tab order
+		if ( toShow.length && toHide.length ) {
+			toHide.prev().attr( "tabIndex", -1 );
+		} else if ( toShow.length ) {
+			this.headers.filter(function() {
+				return $( this ).attr( "tabIndex" ) === 0;
+			})
+			.attr( "tabIndex", -1 );
+		}
+
+		toShow
+			.attr({
+				"aria-expanded": "true",
+				"aria-hidden": "false"
+			})
+			.prev()
+				.attr({
+					"aria-selected": "true",
+					tabIndex: 0
+				});
+	},
+
+	_animate: function( toShow, toHide, data ) {
+		var total, easing, duration,
+			that = this,
+			adjust = 0,
+			down = toShow.length &&
+				( !toHide.length || ( toShow.index() < toHide.index() ) ),
+			animate = this.options.animate || {},
+			options = down && animate.down || animate,
+			complete = function() {
+				that._toggleComplete( data );
+			};
+
+		if ( typeof options === "number" ) {
+			duration = options;
+		}
+		if ( typeof options === "string" ) {
+			easing = options;
+		}
+		// fall back from options to animation in case of partial down settings
+		easing = easing || options.easing || animate.easing;
+		duration = duration || options.duration || animate.duration;
+
+		if ( !toHide.length ) {
+			return toShow.animate( showProps, duration, easing, complete );
+		}
+		if ( !toShow.length ) {
+			return toHide.animate( hideProps, duration, easing, complete );
+		}
+
+		total = toShow.show().outerHeight();
+		toHide.animate( hideProps, {
+			duration: duration,
+			easing: easing,
+			step: function( now, fx ) {
+				fx.now = Math.round( now );
+			}
+		});
+		toShow
+			.hide()
+			.animate( showProps, {
+				duration: duration,
+				easing: easing,
+				complete: complete,
+				step: function( now, fx ) {
+					fx.now = Math.round( now );
+					if ( fx.prop !== "height" ) {
+						adjust += fx.now;
+					} else if ( that.options.heightStyle !== "content" ) {
+						fx.now = Math.round( total - toHide.outerHeight() - adjust );
+						adjust = 0;
+					}
+				}
+			});
+	},
+
+	_toggleComplete: function( data ) {
+		var toHide = data.oldPanel;
+
+		toHide
+			.removeClass( "ui-accordion-content-active" )
+			.prev()
+				.removeClass( "ui-corner-top" )
+				.addClass( "ui-corner-all" );
+
+		// Work around for rendering bug in IE (#5421)
+		if ( toHide.length ) {
+			toHide.parent()[0].className = toHide.parent()[0].className;
+		}
+
+		this._trigger( "activate", null, data );
+	}
+});
+
+})( jQuery );
+(function( $, undefined ) {
+
+// used to prevent race conditions with remote data sources
+var requestIndex = 0;
+
+$.widget( "ui.autocomplete", {
+	version: "1.10.0",
+	defaultElement: "<input>",
+	options: {
+		appendTo: null,
+		autoFocus: false,
+		delay: 300,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null,
+
+		// callbacks
+		change: null,
+		close: null,
+		focus: null,
+		open: null,
+		response: null,
+		search: null,
+		select: null
+	},
+
+	pending: 0,
+
+	_create: function() {
+		// Some browsers only repeat keydown events, not keypress events,
+		// so we use the suppressKeyPress flag to determine if we've already
+		// handled the keydown event. #7269
+		// Unfortunately the code for & in keypress is the same as the up arrow,
+		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
+		// events when we know the keydown event was used to modify the
+		// search term. #7799
+		var suppressKeyPress, suppressKeyPressRepeat, suppressInput;
+
+		this.isMultiLine = this._isMultiLine();
+		this.valueMethod = this.element[ this.element.is( "input,textarea" ) ? "val" : "text" ];
+		this.isNewMenu = true;
+
+		this.element
+			.addClass( "ui-autocomplete-input" )
+			.attr( "autocomplete", "off" );
+
+		this._on( this.element, {
+			keydown: function( event ) {
+				/*jshint maxcomplexity:15*/
+				if ( this.element.prop( "readOnly" ) ) {
+					suppressKeyPress = true;
+					suppressInput = true;
+					suppressKeyPressRepeat = true;
+					return;
+				}
+
+				suppressKeyPress = false;
+				suppressInput = false;
+				suppressKeyPressRepeat = false;
+				var keyCode = $.ui.keyCode;
+				switch( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					suppressKeyPress = true;
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					suppressKeyPress = true;
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					suppressKeyPress = true;
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					suppressKeyPress = true;
+					this._keyEvent( "next", event );
+					break;
+				case keyCode.ENTER:
+				case keyCode.NUMPAD_ENTER:
+					// when menu is open and has focus
+					if ( this.menu.active ) {
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
+						event.preventDefault();
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.TAB:
+					if ( this.menu.active ) {
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.ESCAPE:
+					if ( this.menu.element.is( ":visible" ) ) {
+						this._value( this.term );
+						this.close( event );
+						// Different browsers have different default behavior for escape
+						// Single press can mean undo or clear
+						// Double press in IE means clear the whole form
+						event.preventDefault();
+					}
+					break;
+				default:
+					suppressKeyPressRepeat = true;
+					// search timeout should be triggered before the input value is changed
+					this._searchTimeout( event );
+					break;
+				}
+			},
+			keypress: function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					event.preventDefault();
+					return;
+				}
+				if ( suppressKeyPressRepeat ) {
+					return;
+				}
+
+				// replicate some key handlers to allow them to repeat in Firefox and Opera
+				var keyCode = $.ui.keyCode;
+				switch( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					this._keyEvent( "next", event );
+					break;
+				}
+			},
+			input: function( event ) {
+				if ( suppressInput ) {
+					suppressInput = false;
+					event.preventDefault();
+					return;
+				}
+				this._searchTimeout( event );
+			},
+			focus: function() {
+				this.selectedItem = null;
+				this.previous = this._value();
+			},
+			blur: function( event ) {
+				if ( this.cancelBlur ) {
+					delete this.cancelBlur;
+					return;
+				}
+
+				clearTimeout( this.searching );
+				this.close( event );
+				this._change( event );
+			}
+		});
+
+		this._initSource();
+		this.menu = $( "<ul>" )
+			.addClass( "ui-autocomplete" )
+			.appendTo( this._appendTo() )
+			.menu({
+				// custom key handling for now
+				input: $(),
+				// disable ARIA support, the live region takes care of that
+				role: null
+			})
+			.zIndex( this.element.zIndex() + 1 )
+			.hide()
+			.data( "ui-menu" );
+
+		this._on( this.menu.element, {
+			mousedown: function( event ) {
+				// prevent moving focus out of the text field
+				event.preventDefault();
+
+				// IE doesn't prevent moving focus even with event.preventDefault()
+				// so we set a flag to know when we should ignore the blur event
+				this.cancelBlur = true;
+				this._delay(function() {
+					delete this.cancelBlur;
+				});
+
+				// clicking on the scrollbar causes focus to shift to the body
+				// but we can't detect a mouseup or a click immediately afterward
+				// so we have to track the next mousedown and close the menu if
+				// the user clicks somewhere outside of the autocomplete
+				var menuElement = this.menu.element[ 0 ];
+				if ( !$( event.target ).closest( ".ui-menu-item" ).length ) {
+					this._delay(function() {
+						var that = this;
+						this.document.one( "mousedown", function( event ) {
+							if ( event.target !== that.element[ 0 ] &&
+									event.target !== menuElement &&
+									!$.contains( menuElement, event.target ) ) {
+								that.close();
+							}
+						});
+					});
+				}
+			},
+			menufocus: function( event, ui ) {
+				// #7024 - Prevent accidental activation of menu items in Firefox
+				if ( this.isNewMenu ) {
+					this.isNewMenu = false;
+					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
+						this.menu.blur();
+
+						this.document.one( "mousemove", function() {
+							$( event.target ).trigger( event.originalEvent );
+						});
+
+						return;
+					}
+				}
+
+				var item = ui.item.data( "ui-autocomplete-item" );
+				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
+					// use value to match what will end up in the input, if it was a key event
+					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
+						this._value( item.value );
+					}
+				} else {
+					// Normally the input is populated with the item's value as the
+					// menu is navigated, causing screen readers to notice a change and
+					// announce the item. Since the focus event was canceled, this doesn't
+					// happen, so we update the live region so that screen readers can
+					// still notice the change and announce it.
+					this.liveRegion.text( item.value );
+				}
+			},
+			menuselect: function( event, ui ) {
+				var item = ui.item.data( "ui-autocomplete-item" ),
+					previous = this.previous;
+
+				// only trigger when focus was lost (click on menu)
+				if ( this.element[0] !== this.document[0].activeElement ) {
+					this.element.focus();
+					this.previous = previous;
+					// #6109 - IE triggers two focus events and the second
+					// is asynchronous, so we need to reset the previous
+					// term synchronously and asynchronously :-(
+					this._delay(function() {
+						this.previous = previous;
+						this.selectedItem = item;
+					});
+				}
+
+				if ( false !== this._trigger( "select", event, { item: item } ) ) {
+					this._value( item.value );
+				}
+				// reset the term after the select event
+				// this allows custom select handling to work properly
+				this.term = this._value();
+
+				this.close( event );
+				this.selectedItem = item;
+			}
+		});
+
+		this.liveRegion = $( "<span>", {
+				role: "status",
+				"aria-live": "polite"
+			})
+			.addClass( "ui-helper-hidden-accessible" )
+			.insertAfter( this.element );
+
+		// turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		this._on( this.window, {
+			beforeunload: function() {
+				this.element.removeAttr( "autocomplete" );
+			}
+		});
+	},
+
+	_destroy: function() {
+		clearTimeout( this.searching );
+		this.element
+			.removeClass( "ui-autocomplete-input" )
+			.removeAttr( "autocomplete" );
+		this.menu.element.remove();
+		this.liveRegion.remove();
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+		if ( key === "source" ) {
+			this._initSource();
+		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( this._appendTo() );
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+
+		if ( element ) {
+			element = element.jquery || element.nodeType ?
+				$( element ) :
+				this.document.find( element ).eq( 0 );
+		}
+
+		if ( !element ) {
+			element = this.element.closest( ".ui-front" );
+		}
+
+		if ( !element.length ) {
+			element = this.document[0].body;
+		}
+
+		return element;
+	},
+
+	_isMultiLine: function() {
+		// Textareas are always multi-line
+		if ( this.element.is( "textarea" ) ) {
+			return true;
+		}
+		// Inputs are always single-line, even if inside a contentEditable element
+		// IE also treats inputs as contentEditable
+		if ( this.element.is( "input" ) ) {
+			return false;
+		}
+		// All other element types are determined by whether or not they're contentEditable
+		return this.element.prop( "isContentEditable" );
+	},
+
+	_initSource: function() {
+		var array, url,
+			that = this;
+		if ( $.isArray(this.options.source) ) {
+			array = this.options.source;
+			this.source = function( request, response ) {
+				response( $.ui.autocomplete.filter( array, request.term ) );
+			};
+		} else if ( typeof this.options.source === "string" ) {
+			url = this.options.source;
+			this.source = function( request, response ) {
+				if ( that.xhr ) {
+					that.xhr.abort();
+				}
+				that.xhr = $.ajax({
+					url: url,
+					data: request,
+					dataType: "json",
+					success: function( data ) {
+						response( data );
+					},
+					error: function() {
+						response( [] );
+					}
+				});
+			};
+		} else {
+			this.source = this.options.source;
+		}
+	},
+
+	_searchTimeout: function( event ) {
+		clearTimeout( this.searching );
+		this.searching = this._delay(function() {
+			// only search if the value has changed
+			if ( this.term !== this._value() ) {
+				this.selectedItem = null;
+				this.search( null, event );
+			}
+		}, this.options.delay );
+	},
+
+	search: function( value, event ) {
+		value = value != null ? value : this._value();
+
+		// always save the actual value, not the one passed as an argument
+		this.term = this._value();
+
+		if ( value.length < this.options.minLength ) {
+			return this.close( event );
+		}
+
+		if ( this._trigger( "search", event ) === false ) {
+			return;
+		}
+
+		return this._search( value );
+	},
+
+	_search: function( value ) {
+		this.pending++;
+		this.element.addClass( "ui-autocomplete-loading" );
+		this.cancelSearch = false;
+
+		this.source( { term: value }, this._response() );
+	},
+
+	_response: function() {
+		var that = this,
+			index = ++requestIndex;
+
+		return function( content ) {
+			if ( index === requestIndex ) {
+				that.__response( content );
+			}
+
+			that.pending--;
+			if ( !that.pending ) {
+				that.element.removeClass( "ui-autocomplete-loading" );
+			}
+		};
+	},
+
+	__response: function( content ) {
+		if ( content ) {
+			content = this._normalize( content );
+		}
+		this._trigger( "response", null, { content: content } );
+		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
+			this._suggest( content );
+			this._trigger( "open" );
+		} else {
+			// use ._close() instead of .close() so we don't cancel future searches
+			this._close();
+		}
+	},
+
+	close: function( event ) {
+		this.cancelSearch = true;
+		this._close( event );
+	},
+
+	_close: function( event ) {
+		if ( this.menu.element.is( ":visible" ) ) {
+			this.menu.element.hide();
+			this.menu.blur();
+			this.isNewMenu = true;
+			this._trigger( "close", event );
+		}
+	},
+
+	_change: function( event ) {
+		if ( this.previous !== this._value() ) {
+			this._trigger( "change", event, { item: this.selectedItem } );
+		}
+	},
+
+	_normalize: function( items ) {
+		// assume all items have the right format when the first item is complete
+		if ( items.length && items[0].label && items[0].value ) {
+			return items;
+		}
+		return $.map( items, function( item ) {
+			if ( typeof item === "string" ) {
+				return {
+					label: item,
+					value: item
+				};
+			}
+			return $.extend({
+				label: item.label || item.value,
+				value: item.value || item.label
+			}, item );
+		});
+	},
+
+	_suggest: function( items ) {
+		var ul = this.menu.element
+			.empty()
+			.zIndex( this.element.zIndex() + 1 );
+		this._renderMenu( ul, items );
+		this.menu.refresh();
+
+		// size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend({
+			of: this.element
+		}, this.options.position ));
+
+		if ( this.options.autoFocus ) {
+			this.menu.next();
+		}
+	},
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+			// Firefox wraps long text (possibly a rounding bug)
+			// so we add 1px to avoid the wrapping (#7513)
+			ul.width( "" ).outerWidth() + 1,
+			this.element.outerWidth()
+		) );
+	},
+
+	_renderMenu: function( ul, items ) {
+		var that = this;
+		$.each( items, function( index, item ) {
+			that._renderItemData( ul, item );
+		});
+	},
+
+	_renderItemData: function( ul, item ) {
+		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
+	},
+
+	_renderItem: function( ul, item ) {
+		return $( "<li>" )
+			.append( $( "<a>" ).text( item.label ) )
+			.appendTo( ul );
+	},
+
+	_move: function( direction, event ) {
+		if ( !this.menu.element.is( ":visible" ) ) {
+			this.search( null, event );
+			return;
+		}
+		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
+				this.menu.isLastItem() && /^next/.test( direction ) ) {
+			this._value( this.term );
+			this.menu.blur();
+			return;
+		}
+		this.menu[ direction ]( event );
+	},
+
+	widget: function() {
+		return this.menu.element;
+	},
+
+	_value: function() {
+		return this.valueMethod.apply( this.element, arguments );
+	},
+
+	_keyEvent: function( keyEvent, event ) {
+		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+			this._move( keyEvent, event );
+
+			// prevents moving cursor to beginning/end of the text field in some browsers
+			event.preventDefault();
+		}
+	}
+});
+
+$.extend( $.ui.autocomplete, {
+	escapeRegex: function( value ) {
+		return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
+	},
+	filter: function(array, term) {
+		var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
+		return $.grep( array, function(value) {
+			return matcher.test( value.label || value.value || value );
+		});
+	}
+});
+
+
+// live region extension, adding a `messages` option
+// NOTE: This is an experimental API. We are still investigating
+// a full solution for string manipulation and internationalization.
+$.widget( "ui.autocomplete", $.ui.autocomplete, {
+	options: {
+		messages: {
+			noResults: "No search results.",
+			results: function( amount ) {
+				return amount + ( amount > 1 ? " results are" : " result is" ) +
+					" available, use up and down arrow keys to navigate.";
+			}
+		}
+	},
+
+	__response: function( content ) {
+		var message;
+		this._superApply( arguments );
+		if ( this.options.disabled || this.cancelSearch ) {
+			return;
+		}
+		if ( content && content.length ) {
+			message = this.options.messages.results( content.length );
+		} else {
+			message = this.options.messages.noResults;
+		}
+		this.liveRegion.text( message );
+	}
+});
+
+}( jQuery ));
+(function( $, undefined ) {
+
+var lastActive, startXPos, startYPos, clickDragged,
+	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
+	stateClasses = "ui-state-hover ui-state-active ",
+	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
+	formResetHandler = function() {
+		var buttons = $( this ).find( ":ui-button" );
+		setTimeout(function() {
+			buttons.button( "refresh" );
+		}, 1 );
+	},
+	radioGroup = function( radio ) {
+		var name = radio.name,
+			form = radio.form,
+			radios = $( [] );
+		if ( name ) {
+			name = name.replace( /'/g, "\\'" );
+			if ( form ) {
+				radios = $( form ).find( "[name='" + name + "']" );
+			} else {
+				radios = $( "[name='" + name + "']", radio.ownerDocument )
+					.filter(function() {
+						return !this.form;
+					});
+			}
+		}
+		return radios;
+	};
+
+$.widget( "ui.button", {
+	version: "1.10.0",
+	defaultElement: "<button>",
+	options: {
+		disabled: null,
+		text: true,
+		label: null,
+		icons: {
+			primary: null,
+			secondary: null
+		}
+	},
+	_create: function() {
+		this.element.closest( "form" )
+			.unbind( "reset" + this.eventNamespace )
+			.bind( "reset" + this.eventNamespace, formResetHandler );
+
+		if ( typeof this.options.disabled !== "boolean" ) {
+			this.options.disabled = !!this.element.prop( "disabled" );
+		} else {
+			this.element.prop( "disabled", this.options.disabled );
+		}
+
+		this._determineButtonType();
+		this.hasTitle = !!this.buttonElement.attr( "title" );
+
+		var that = this,
+			options = this.options,
+			toggleButton = this.type === "checkbox" || this.type === "radio",
+			activeClass = !toggleButton ? "ui-state-active" : "",
+			focusClass = "ui-state-focus";
+
+		if ( options.label === null ) {
+			options.label = (this.type === "input" ? this.buttonElement.val() : this.buttonElement.html());
+		}
+
+		this._hoverable( this.buttonElement );
+
+		this.buttonElement
+			.addClass( baseClasses )
+			.attr( "role", "button" )
+			.bind( "mouseenter" + this.eventNamespace, function() {
+				if ( options.disabled ) {
+					return;
+				}
+				if ( this === lastActive ) {
+					$( this ).addClass( "ui-state-active" );
+				}
+			})
+			.bind( "mouseleave" + this.eventNamespace, function() {
+				if ( options.disabled ) {
+					return;
+				}
+				$( this ).removeClass( activeClass );
+			})
+			.bind( "click" + this.eventNamespace, function( event ) {
+				if ( options.disabled ) {
+					event.preventDefault();
+					event.stopImmediatePropagation();
+				}
+			});
+
+		this.element
+			.bind( "focus" + this.eventNamespace, function() {
+				// no need to check disabled, focus won't be triggered anyway
+				that.buttonElement.addClass( focusClass );
+			})
+			.bind( "blur" + this.eventNamespace, function() {
+				that.buttonElement.removeClass( focusClass );
+			});
+
+		if ( toggleButton ) {
+			this.element.bind( "change" + this.eventNamespace, function() {
+				if ( clickDragged ) {
+					return;
+				}
+				that.refresh();
+			});
+			// if mouse moves between mousedown and mouseup (drag) set clickDragged flag
+			// prevents issue where button state changes but checkbox/radio checked state
+			// does not in Firefox (see ticket #6970)
+			this.buttonElement
+				.bind( "mousedown" + this.eventNamespace, function( event ) {
+					if ( options.disabled ) {
+						return;
+					}
+					clickDragged = false;
+					startXPos = event.pageX;
+					startYPos = event.pageY;
+				})
+				.bind( "mouseup" + this.eventNamespace, function( event ) {
+					if ( options.disabled ) {
+						return;
+					}
+					if ( startXPos !== event.pageX || startYPos !== event.pageY ) {
+						clickDragged = true;
+					}
+			});
+		}
+
+		if ( this.type === "checkbox" ) {
+			this.buttonElement.bind( "click" + this.eventNamespace, function() {
+				if ( options.disabled || clickDragged ) {
+					return false;
+				}
+			});
+		} else if ( this.type === "radio" ) {
+			this.buttonElement.bind( "click" + this.eventNamespace, function() {
+				if ( options.disabled || clickDragged ) {
+					return false;
+				}
+				$( this ).addClass( "ui-state-active" );
+				that.buttonElement.attr( "aria-pressed", "true" );
+
+				var radio = that.element[ 0 ];
+				radioGroup( radio )
+					.not( radio )
+					.map(function() {
+						return $( this ).button( "widget" )[ 0 ];
+					})
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", "false" );
+			});
+		} else {
+			this.buttonElement
+				.bind( "mousedown" + this.eventNamespace, function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).addClass( "ui-state-active" );
+					lastActive = this;
+					that.document.one( "mouseup", function() {
+						lastActive = null;
+					});
+				})
+				.bind( "mouseup" + this.eventNamespace, function() {
+					if ( options.disabled ) {
+						return false;
+					}
+					$( this ).removeClass( "ui-state-active" );
+				})
+				.bind( "keydown" + this.eventNamespace, function(event) {
+					if ( options.disabled ) {
+						return false;
+					}
+					if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) {
+						$( this ).addClass( "ui-state-active" );
+					}
+				})
+				// see #8559, we bind to blur here in case the button element loses
+				// focus between keydown and keyup, it would be left in an "active" state
+				.bind( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() {
+					$( this ).removeClass( "ui-state-active" );
+				});
+
+			if ( this.buttonElement.is("a") ) {
+				this.buttonElement.keyup(function(event) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						// TODO pass through original event correctly (just as 2nd argument doesn't work)
+						$( this ).click();
+					}
+				});
+			}
+		}
+
+		// TODO: pull out $.Widget's handling for the disabled option into
+		// $.Widget.prototype._setOptionDisabled so it's easy to proxy and can
+		// be overridden by individual plugins
+		this._setOption( "disabled", options.disabled );
+		this._resetButton();
+	},
+
+	_determineButtonType: function() {
+		var ancestor, labelSelector, checked;
+
+		if ( this.element.is("[type=checkbox]") ) {
+			this.type = "checkbox";
+		} else if ( this.element.is("[type=radio]") ) {
+			this.type = "radio";
+		} else if ( this.element.is("input") ) {
+			this.type = "input";
+		} else {
+			this.type = "button";
+		}
+
+		if ( this.type === "checkbox" || this.type === "radio" ) {
+			// we don't search against the document in case the element
+			// is disconnected from the DOM
+			ancestor = this.element.parents().last();
+			labelSelector = "label[for='" + this.element.attr("id") + "']";
+			this.buttonElement = ancestor.find( labelSelector );
+			if ( !this.buttonElement.length ) {
+				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
+				this.buttonElement = ancestor.filter( labelSelector );
+				if ( !this.buttonElement.length ) {
+					this.buttonElement = ancestor.find( labelSelector );
+				}
+			}
+			this.element.addClass( "ui-helper-hidden-accessible" );
+
+			checked = this.element.is( ":checked" );
+			if ( checked ) {
+				this.buttonElement.addClass( "ui-state-active" );
+			}
+			this.buttonElement.prop( "aria-pressed", checked );
+		} else {
+			this.buttonElement = this.element;
+		}
+	},
+
+	widget: function() {
+		return this.buttonElement;
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass( "ui-helper-hidden-accessible" );
+		this.buttonElement
+			.removeClass( baseClasses + " " + stateClasses + " " + typeClasses )
+			.removeAttr( "role" )
+			.removeAttr( "aria-pressed" )
+			.html( this.buttonElement.find(".ui-button-text").html() );
+
+		if ( !this.hasTitle ) {
+			this.buttonElement.removeAttr( "title" );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.prop( "disabled", true );
+			} else {
+				this.element.prop( "disabled", false );
+			}
+			return;
+		}
+		this._resetButton();
+	},
+
+	refresh: function() {
+		//See #8237 & #8828
+		var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOption( "disabled", isDisabled );
+		}
+		if ( this.type === "radio" ) {
+			radioGroup( this.element[0] ).each(function() {
+				if ( $( this ).is( ":checked" ) ) {
+					$( this ).button( "widget" )
+						.addClass( "ui-state-active" )
+						.attr( "aria-pressed", "true" );
+				} else {
+					$( this ).button( "widget" )
+						.removeClass( "ui-state-active" )
+						.attr( "aria-pressed", "false" );
+				}
+			});
+		} else if ( this.type === "checkbox" ) {
+			if ( this.element.is( ":checked" ) ) {
+				this.buttonElement
+					.addClass( "ui-state-active" )
+					.attr( "aria-pressed", "true" );
+			} else {
+				this.buttonElement
+					.removeClass( "ui-state-active" )
+					.attr( "aria-pressed", "false" );
+			}
+		}
+	},
+
+	_resetButton: function() {
+		if ( this.type === "input" ) {
+			if ( this.options.label ) {
+				this.element.val( this.options.label );
+			}
+			return;
+		}
+		var buttonElement = this.buttonElement.removeClass( typeClasses ),
+			buttonText = $( "<span></span>", this.document[0] )
+				.addClass( "ui-button-text" )
+				.html( this.options.label )
+				.appendTo( buttonElement.empty() )
+				.text(),
+			icons = this.options.icons,
+			multipleIcons = icons.primary && icons.secondary,
+			buttonClasses = [];
+
+		if ( icons.primary || icons.secondary ) {
+			if ( this.options.text ) {
+				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
+			}
+
+			if ( icons.primary ) {
+				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
+			}
+
+			if ( icons.secondary ) {
+				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
+			}
+
+			if ( !this.options.text ) {
+				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+
+				if ( !this.hasTitle ) {
+					buttonElement.attr( "title", $.trim( buttonText ) );
+				}
+			}
+		} else {
+			buttonClasses.push( "ui-button-text-only" );
+		}
+		buttonElement.addClass( buttonClasses.join( " " ) );
+	}
+});
+
+$.widget( "ui.buttonset", {
+	version: "1.10.0",
+	options: {
+		items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
+	},
+
+	_create: function() {
+		this.element.addClass( "ui-buttonset" );
+	},
+
+	_init: function() {
+		this.refresh();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "disabled" ) {
+			this.buttons.button( "option", key, value );
+		}
+
+		this._super( key, value );
+	},
+
+	refresh: function() {
+		var rtl = this.element.css( "direction" ) === "rtl";
+
+		this.buttons = this.element.find( this.options.items )
+			.filter( ":ui-button" )
+				.button( "refresh" )
+			.end()
+			.not( ":ui-button" )
+				.button()
+			.end()
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
+				.filter( ":first" )
+					.addClass( rtl ? "ui-corner-right" : "ui-corner-left" )
+				.end()
+				.filter( ":last" )
+					.addClass( rtl ? "ui-corner-left" : "ui-corner-right" )
+				.end()
+			.end();
+	},
+
+	_destroy: function() {
+		this.element.removeClass( "ui-buttonset" );
+		this.buttons
+			.map(function() {
+				return $( this ).button( "widget" )[ 0 ];
+			})
+				.removeClass( "ui-corner-left ui-corner-right" )
+			.end()
+			.button( "destroy" );
+	}
+});
+
+}( jQuery ) );
+(function( $, undefined ) {
+
+$.extend($.ui, { datepicker: { version: "1.10.0" } });
+
+var PROP_NAME = "datepicker",
+	dpuuid = new Date().getTime(),
+	instActive;
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
+	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
+	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
+	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
+	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
+	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
+	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
+	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
+	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[""] = { // Default regional settings
+		closeText: "Done", // Display text for close link
+		prevText: "Prev", // Display text for previous month link
+		nextText: "Next", // Display text for next month link
+		currentText: "Today", // Display text for current month link
+		monthNames: ["January","February","March","April","May","June",
+			"July","August","September","October","November","December"], // Names of months for drop-down and formatting
+		monthNamesShort: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], // For formatting
+		dayNames: ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], // For formatting
+		dayNamesShort: ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], // For formatting
+		dayNamesMin: ["Su","Mo","Tu","We","Th","Fr","Sa"], // Column headings for days starting at Sunday
+		weekHeader: "Wk", // Column header for week of the year
+		dateFormat: "mm/dd/yy", // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: "" // Additional text to append to the year in the month headers
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: "focus", // "focus" for popup on focus,
+			// "button" for trigger button, or "both" for either
+		showAnim: "fadeIn", // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: "", // Display text following the input box, e.g. showing the format
+		buttonText: "...", // Text for trigger button
+		buttonImage: "", // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: "c-10:c+10", // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: "+10", // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with "+" for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: "fast", // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: "", // Selector for an alternate field to store selected dates into
+		altFormat: "", // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false, // True to size the input for the date format, false to leave as is
+		disabled: false // The initial disabled state
+	};
+	$.extend(this._defaults, this.regional[""]);
+	this.dpDiv = bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: "hasDatepicker",
+
+	//Keep track of the maximum number of rows displayed (see #7043)
+	maxRows: 4,
+
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	 * @param  settings  object - the new settings to use as defaults (anonymous object)
+	 * @return the manager object
+	 */
+	setDefaults: function(settings) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
+	 */
+	_attachDatepicker: function(target, settings) {
+		var nodeName, inline, inst;
+		nodeName = target.nodeName.toLowerCase();
+		inline = (nodeName === "div" || nodeName === "span");
+		if (!target.id) {
+			this.uuid += 1;
+			target.id = "dp" + this.uuid;
+		}
+		inst = this._newInst($(target), inline);
+		inst.settings = $.extend({}, settings || {});
+		if (nodeName === "input") {
+			this._connectDatepicker(target, inst);
+		} else if (inline) {
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function(target, inline) {
+		var id = target[0].id.replace(/([^A-Za-z0-9_\-])/g, "\\\\$1"); // escape jQuery meta chars
+		return {id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: (!inline ? this.dpDiv : // presentation div
+			bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		inst.append = $([]);
+		inst.trigger = $([]);
+		if (input.hasClass(this.markerClassName)) {
+			return;
+		}
+		this._attachments(input, inst);
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).
+			keypress(this._doKeyPress).keyup(this._doKeyUp);
+		this._autoSize(inst);
+		$.data(target, PROP_NAME, inst);
+		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function(input, inst) {
+		var showOn, buttonText, buttonImage,
+			appendText = this._get(inst, "appendText"),
+			isRTL = this._get(inst, "isRTL");
+
+		if (inst.append) {
+			inst.append.remove();
+		}
+		if (appendText) {
+			inst.append = $("<span class='" + this._appendClass + "'>" + appendText + "</span>");
+			input[isRTL ? "before" : "after"](inst.append);
+		}
+
+		input.unbind("focus", this._showDatepicker);
+
+		if (inst.trigger) {
+			inst.trigger.remove();
+		}
+
+		showOn = this._get(inst, "showOn");
+		if (showOn === "focus" || showOn === "both") { // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		}
+		if (showOn === "button" || showOn === "both") { // pop-up date picker when button clicked
+			buttonText = this._get(inst, "buttonText");
+			buttonImage = this._get(inst, "buttonImage");
+			inst.trigger = $(this._get(inst, "buttonImageOnly") ?
+				$("<img/>").addClass(this._triggerClass).
+					attr({ src: buttonImage, alt: buttonText, title: buttonText }) :
+				$("<button type='button'></button>").addClass(this._triggerClass).
+					html(!buttonImage ? buttonText : $("<img/>").attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? "before" : "after"](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
+					$.datepicker._hideDatepicker();
+				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
+					$.datepicker._hideDatepicker();
+					$.datepicker._showDatepicker(input[0]);
+				} else {
+					$.datepicker._showDatepicker(input[0]);
+				}
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, "autoSize") && !inst.inline) {
+			var findMax, max, maxI, i,
+				date = new Date(2009, 12 - 1, 20), // Ensure double digits
+				dateFormat = this._get(inst, "dateFormat");
+
+			if (dateFormat.match(/[DM]/)) {
+				findMax = function(names) {
+					max = 0;
+					maxI = 0;
+					for (i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					"monthNames" : "monthNamesShort"))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
+			}
+			inst.input.attr("size", this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName)) {
+			return;
+		}
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	 * @param  input element - ignored
+	 * @param  date	string or Date - the initial date to display
+	 * @param  onSelect  function - the function to call when a date is selected
+	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
+	 *					event - with x/y coordinates or
+	 *					leave empty for default (screen centre)
+	 * @return the manager object
+	 */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var id, browserWidth, browserHeight, scrollX, scrollY,
+			inst = this._dialogInst; // internal instance
+
+		if (!inst) {
+			this.uuid += 1;
+			id = "dp" + this.uuid;
+			this._dialogInput = $("<input type='text' id='" + id +
+				"' style='position: absolute; top: -100px; width: 0px;'/>");
+			this._dialogInput.keydown(this._doKeyDown);
+			$("body").append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI) {
+			$.blockUI(this.dpDiv);
+		}
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_destroyDatepicker: function(target) {
+		var nodeName,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName === "input") {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind("focus", this._showDatepicker).
+				unbind("keydown", this._doKeyDown).
+				unbind("keypress", this._doKeyPress).
+				unbind("keyup", this._doKeyUp);
+		} else if (nodeName === "div" || nodeName === "span") {
+			$target.removeClass(this.markerClassName).empty();
+		}
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_enableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = false;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = false; }).end().
+				filter("img").css({opacity: "1.0", cursor: ""});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().removeClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", false);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_disableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = true;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = true; }).end().
+				filter("img").css({opacity: "0.5", cursor: "default"});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().addClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", true);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	 * @param  target	element - the target input field or division or span
+	 * @return boolean - true if disabled, false if enabled
+	 */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] === target) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	 * @param  target  element - the target input field or division or span
+	 * @return  object - the associated instance data
+	 * @throws  error if a jQuery problem getting data
+	 */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw "Missing instance data for this datepicker";
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 * @param  name	object - the new settings to update or
+	 *				string - the name of the setting to change or retrieve,
+	 *				when retrieving also "all" for all instance settings or
+	 *				"defaults" for all global defaults
+	 * @param  value   any - the new value for the setting
+	 *				(omit if above is an object or to retrieve a value)
+	 */
+	_optionDatepicker: function(target, name, value) {
+		var settings, date, minDate, maxDate,
+			inst = this._getInst(target);
+
+		if (arguments.length === 2 && typeof name === "string") {
+			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name === "all" ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+
+		settings = name || {};
+		if (typeof name === "string") {
+			settings = {};
+			settings[name] = value;
+		}
+
+		if (inst) {
+			if (this._curInst === inst) {
+				this._hideDatepicker();
+			}
+
+			date = this._getDateDatepicker(target, true);
+			minDate = this._getMinMaxDate(inst, "min");
+			maxDate = this._getMinMaxDate(inst, "max");
+			extendRemove(inst.settings, settings);
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
+				inst.settings.minDate = this._formatDate(inst, minDate);
+			}
+			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
+				inst.settings.maxDate = this._formatDate(inst, maxDate);
+			}
+			if ( "disabled" in settings ) {
+				if ( settings.disabled ) {
+					this._disableDatepicker(target);
+				} else {
+					this._enableDatepicker(target);
+				}
+			}
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDate(inst, date);
+			this._updateAlternate(inst);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  date	Date - the new date
+	 */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  noDefault boolean - true if no default date is to be used
+	 * @return Date - the current date
+	 */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline) {
+			this._setDateFromField(inst, noDefault);
+		}
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var onSelect, dateStr, sel,
+			inst = $.datepicker._getInst(event.target),
+			handled = true,
+			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
+
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing) {
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv);
+						if (sel[0]) {
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+						}
+
+						onSelect = $.datepicker._get(inst, "onSelect");
+						if (onSelect) {
+							dateStr = $.datepicker._formatDate(inst);
+
+							// trigger custom callback
+							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+						} else {
+							$.datepicker._hideDatepicker();
+						}
+
+						return false; // don't submit the form
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, "stepBigMonths") :
+							-$.datepicker._get(inst, "stepMonths")), "M");
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, "stepBigMonths") :
+							+$.datepicker._get(inst, "stepMonths")), "M");
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._clearDate(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._gotoToday(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								-$.datepicker._get(inst, "stepBigMonths") :
+								-$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, -7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								+$.datepicker._get(inst, "stepBigMonths") :
+								+$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, +7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		} else {
+			handled = false;
+		}
+
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var chars, chr,
+			inst = $.datepicker._getInst(event.target);
+
+		if ($.datepicker._get(inst, "constrainInput")) {
+			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
+			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var date,
+			inst = $.datepicker._getInst(event.target);
+
+		if (inst.input.val() !== inst.lastVal) {
+			try {
+				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (err) {
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	 * If false returned from beforeShow event handler do not show.
+	 * @param  input  element - the input field attached to the date picker or
+	 *					event - if triggered by focus
+	 */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
+			input = $("input", input.parentNode)[0];
+		}
+
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
+			return;
+		}
+
+		var inst, beforeShow, beforeShowSettings, isFixed,
+			offset, showAnim, duration;
+
+		inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
+			}
+		}
+
+		beforeShow = $.datepicker._get(inst, "beforeShow");
+		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
+		if(beforeShowSettings === false){
+			return;
+		}
+		extendRemove(inst.settings, beforeShowSettings);
+
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+
+		if ($.datepicker._inDialog) { // hide cursor
+			input.value = "";
+		}
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+
+		isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css("position") === "fixed";
+			return !isFixed;
+		});
+
+		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
+			left: offset.left + "px", top: offset.top + "px"});
+
+		if (!inst.inline) {
+			showAnim = $.datepicker._get(inst, "showAnim");
+			duration = $.datepicker._get(inst, "duration");
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			$.datepicker._datepickerShowing = true;
+
+			if ( $.effects && $.effects.effect[ showAnim ] ) {
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
+			} else {
+				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
+			}
+
+			if (inst.input.is(":visible") && !inst.input.is(":disabled")) {
+				inst.input.focus();
+			}
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		this._attachHandlers(inst);
+		inst.dpDiv.find("." + this._dayOverClass + " a").mouseover();
+
+		var origyearshtml,
+			numMonths = this._getNumberOfMonths(inst),
+			cols = numMonths[1],
+			width = 17;
+
+		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
+		if (cols > 1) {
+			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
+		}
+		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
+			"Class"]("ui-datepicker-multi");
+		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
+			"Class"]("ui-datepicker-rtl");
+
+		// #6694 - don't focus the input if it's already focused
+		// this breaks the change event in IE
+		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && inst.input &&
+			inst.input.is(":visible") && !inst.input.is(":disabled") && inst.input[0] !== document.activeElement) {
+			inst.input.focus();
+		}
+
+		// deffered render of the years select (to avoid flashes on Firefox)
+		if( inst.yearshtml ){
+			origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
+					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	/* Retrieve the size of left and top borders for an element.
+	 * @param  elem  (jQuery object) the element of interest
+	 * @return  (number[2]) the left and top borders
+	 */
+	_getBorders: function(elem) {
+		var convert = function(value) {
+			return {thin: 1, medium: 2, thick: 3}[value] || value;
+		};
+		return [parseFloat(convert(elem.css("border-left-width"))),
+			parseFloat(convert(elem.css("border-top-width")))];
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth(),
+			dpHeight = inst.dpDiv.outerHeight(),
+			inputWidth = inst.input ? inst.input.outerWidth() : 0,
+			inputHeight = inst.input ? inst.input.outerHeight() : 0,
+			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
+			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
+
+		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var position,
+			inst = this._getInst(obj),
+			isRTL = this._get(inst, "isRTL");
+
+		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
+			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
+		}
+
+		position = $(obj).offset();
+		return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	 * @param  input  element - the input field attached to the date picker
+	 */
+	_hideDatepicker: function(input) {
+		var showAnim, duration, postProcess, onClose,
+			inst = this._curInst;
+
+		if (!inst || (input && inst !== $.data(input, PROP_NAME))) {
+			return;
+		}
+
+		if (this._datepickerShowing) {
+			showAnim = this._get(inst, "showAnim");
+			duration = this._get(inst, "duration");
+			postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+			};
+
+			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
+			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
+			} else {
+				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
+					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
+			}
+
+			if (!showAnim) {
+				postProcess();
+			}
+			this._datepickerShowing = false;
+
+			onClose = this._get(inst, "onClose");
+			if (onClose) {
+				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
+			}
+
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
+				if ($.blockUI) {
+					$.unblockUI();
+					$("body").append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst) {
+			return;
+		}
+
+		var $target = $(event.target),
+			inst = $.datepicker._getInst($target[0]);
+
+		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
+				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.closest("." + $.datepicker._triggerClass).length &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
+			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
+				$.datepicker._hideDatepicker();
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var date,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		} else {
+			date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		inst["selected" + (period === "M" ? "Month" : "Year")] =
+		inst["draw" + (period === "M" ? "Month" : "Year")] =
+			parseInt(select.options[select.selectedIndex].value,10);
+
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var inst,
+			target = $(id);
+
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+
+		inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $("a", td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		this._selectDate(target, "");
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var onSelect,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input) {
+			inst.input.val(dateStr);
+		}
+		this._updateAlternate(inst);
+
+		onSelect = this._get(inst, "onSelect");
+		if (onSelect) {
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		} else if (inst.input) {
+			inst.input.trigger("change"); // fire the change event
+		}
+
+		if (inst.inline){
+			this._updateDatepicker(inst);
+		} else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) !== "object") {
+				inst.input.focus(); // restore focus
+			}
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altFormat, date, dateStr,
+			altField = this._get(inst, "altField");
+
+		if (altField) { // update alternate field too
+			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
+			date = this._getDate(inst);
+			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	 * @param  date  Date - the date to customise
+	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
+	 */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ""];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	 * @param  date  Date - the date to get the week for
+	 * @return  number - the number of the week within the year that contains this date
+	 */
+	iso8601Week: function(date) {
+		var time,
+			checkDate = new Date(date.getTime());
+
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+
+		time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	 * See formatDate below for the possible formats.
+	 *
+	 * @param  format string - the expected format of the date
+	 * @param  value string - the date in the above format
+	 * @param  settings Object - attributes include:
+	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  Date - the extracted date value or null if value is blank
+	 */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null) {
+			throw "Invalid arguments";
+		}
+
+		value = (typeof value === "object" ? value.toString() : value + "");
+		if (value === "") {
+			return null;
+		}
+
+		var iFormat, dim, extra,
+			iValue = 0,
+			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
+			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			year = -1,
+			month = -1,
+			day = -1,
+			doy = -1,
+			literal = false,
+			date,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Extract a number from the string value
+			getNumber = function(match) {
+				var isDoubled = lookAhead(match),
+					size = (match === "@" ? 14 : (match === "!" ? 20 :
+					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
+					digits = new RegExp("^\\d{1," + size + "}"),
+					num = value.substring(iValue).match(digits);
+				if (!num) {
+					throw "Missing number at position " + iValue;
+				}
+				iValue += num[0].length;
+				return parseInt(num[0], 10);
+			},
+			// Extract a name from the string value and convert to an index
+			getName = function(match, shortNames, longNames) {
+				var index = -1,
+					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+						return [ [k, v] ];
+					}).sort(function (a, b) {
+						return -(a[1].length - b[1].length);
+					});
+
+				$.each(names, function (i, pair) {
+					var name = pair[1];
+					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
+						index = pair[0];
+						iValue += name.length;
+						return false;
+					}
+				});
+				if (index !== -1) {
+					return index + 1;
+				} else {
+					throw "Unknown name at position " + iValue;
+				}
+			},
+			// Confirm that a literal character matches the string value
+			checkLiteral = function() {
+				if (value.charAt(iValue) !== format.charAt(iFormat)) {
+					throw "Unexpected literal at position " + iValue;
+				}
+				iValue++;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					checkLiteral();
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d":
+						day = getNumber("d");
+						break;
+					case "D":
+						getName("D", dayNamesShort, dayNames);
+						break;
+					case "o":
+						doy = getNumber("o");
+						break;
+					case "m":
+						month = getNumber("m");
+						break;
+					case "M":
+						month = getName("M", monthNamesShort, monthNames);
+						break;
+					case "y":
+						year = getNumber("y");
+						break;
+					case "@":
+						date = new Date(getNumber("@"));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "!":
+						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'")){
+							checkLiteral();
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						checkLiteral();
+				}
+			}
+		}
+
+		if (iValue < value.length){
+			extra = value.substr(iValue);
+			if (!/^\s+/.test(extra)) {
+				throw "Extra/unparsed characters found in date: " + extra;
+			}
+		}
+
+		if (year === -1) {
+			year = new Date().getFullYear();
+		} else if (year < 100) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		}
+
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim) {
+					break;
+				}
+				month++;
+				day -= dim;
+			} while (true);
+		}
+
+		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
+			throw "Invalid date"; // E.g. 31/02/00
+		}
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
+	COOKIE: "D, dd M yy",
+	ISO_8601: "yy-mm-dd",
+	RFC_822: "D, d M y",
+	RFC_850: "DD, dd-M-y",
+	RFC_1036: "D, d M y",
+	RFC_1123: "D, d M yy",
+	RFC_2822: "D, d M yy",
+	RSS: "D, d M y", // RFC 822
+	TICKS: "!",
+	TIMESTAMP: "@",
+	W3C: "yy-mm-dd", // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	 * The format can be combinations of the following:
+	 * d  - day of month (no leading zero)
+	 * dd - day of month (two digit)
+	 * o  - day of year (no leading zeros)
+	 * oo - day of year (three digit)
+	 * D  - day name short
+	 * DD - day name long
+	 * m  - month of year (no leading zero)
+	 * mm - month of year (two digit)
+	 * M  - month name short
+	 * MM - month name long
+	 * y  - year (two digit)
+	 * yy - year (four digit)
+	 * @ - Unix timestamp (ms since 01/01/1970)
+	 * ! - Windows ticks (100ns since 01/01/0001)
+	 * "..." - literal text
+	 * '' - single quote
+	 *
+	 * @param  format string - the desired format of the date
+	 * @param  date Date - the date value to format
+	 * @param  settings Object - attributes include:
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  string - the date in the above format
+	 */
+	formatDate: function (format, date, settings) {
+		if (!date) {
+			return "";
+		}
+
+		var iFormat,
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Format a number, with leading zero if necessary
+			formatNumber = function(match, value, len) {
+				var num = "" + value;
+				if (lookAhead(match)) {
+					while (num.length < len) {
+						num = "0" + num;
+					}
+				}
+				return num;
+			},
+			// Format a name, short or long as requested
+			formatName = function(match, value, shortNames, longNames) {
+				return (lookAhead(match) ? longNames[value] : shortNames[value]);
+			},
+			output = "",
+			literal = false;
+
+		if (date) {
+			for (iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal) {
+					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+						literal = false;
+					} else {
+						output += format.charAt(iFormat);
+					}
+				} else {
+					switch (format.charAt(iFormat)) {
+						case "d":
+							output += formatNumber("d", date.getDate(), 2);
+							break;
+						case "D":
+							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
+							break;
+						case "o":
+							output += formatNumber("o",
+								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+							break;
+						case "m":
+							output += formatNumber("m", date.getMonth() + 1, 2);
+							break;
+						case "M":
+							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case "y":
+							output += (lookAhead("y") ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
+							break;
+						case "@":
+							output += date.getTime();
+							break;
+						case "!":
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'")) {
+								output += "'";
+							} else {
+								literal = true;
+							}
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+				}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var iFormat,
+			chars = "",
+			literal = false,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					chars += format.charAt(iFormat);
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d": case "m": case "y": case "@":
+						chars += "0123456789";
+						break;
+					case "D": case "M":
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'")) {
+							chars += "'";
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+			}
+		}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() === inst.lastVal) {
+			return;
+		}
+
+		var dateFormat = this._get(inst, "dateFormat"),
+			dates = inst.lastVal = inst.input ? inst.input.val() : null,
+			defaultDate = this._getDefaultDate(inst),
+			date = defaultDate,
+			settings = this._getFormatConfig(inst);
+
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			dates = (noDefault ? "" : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+				var date = new Date();
+				date.setDate(date.getDate() + offset);
+				return date;
+			},
+			offsetString = function(offset) {
+				try {
+					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+						offset, $.datepicker._getFormatConfig(inst));
+				}
+				catch (e) {
+					// Ignore
+				}
+
+				var date = (offset.toLowerCase().match(/^c/) ?
+					$.datepicker._getDate(inst) : null) || new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth(),
+					day = date.getDate(),
+					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
+					matches = pattern.exec(offset);
+
+				while (matches) {
+					switch (matches[2] || "d") {
+						case "d" : case "D" :
+							day += parseInt(matches[1],10); break;
+						case "w" : case "W" :
+							day += parseInt(matches[1],10) * 7; break;
+						case "m" : case "M" :
+							month += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+						case "y": case "Y" :
+							year += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+					}
+					matches = pattern.exec(offset);
+				}
+				return new Date(year, month, day);
+			},
+			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
+				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+
+		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	 * Hours may be non-zero on daylight saving cut-over:
+	 * > 12 when midnight changeover, but then cannot generate
+	 * midnight datetime, so jump to 1AM, otherwise reset.
+	 * @param  date  (Date) the date to check
+	 * @return  (Date) the corrected date
+	 */
+	_daylightSavingAdjust: function(date) {
+		if (!date) {
+			return null;
+		}
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date,
+			origMonth = inst.selectedMonth,
+			origYear = inst.selectedYear,
+			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
+			this._notifyChange(inst);
+		}
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? "" : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function(inst) {
+		var stepMonths = this._get(inst, "stepMonths"),
+			id = "#" + inst.id.replace( /\\\\/g, "\\" );
+		inst.dpDiv.find("[data-handler]").map(function () {
+			var handler = {
+				prev: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._adjustDate(id, -stepMonths, "M");
+				},
+				next: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._adjustDate(id, +stepMonths, "M");
+				},
+				hide: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._hideDatepicker();
+				},
+				today: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._gotoToday(id);
+				},
+				selectDay: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
+					return false;
+				},
+				selectMonth: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._selectMonthYear(id, this, "M");
+					return false;
+				},
+				selectYear: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._selectMonthYear(id, this, "Y");
+					return false;
+				}
+			};
+			$(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
+		});
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
+			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
+			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
+			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
+			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
+			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
+			tempDate = new Date(),
+			today = this._daylightSavingAdjust(
+				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
+			isRTL = this._get(inst, "isRTL"),
+			showButtonPanel = this._get(inst, "showButtonPanel"),
+			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
+			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
+			numMonths = this._getNumberOfMonths(inst),
+			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
+			stepMonths = this._get(inst, "stepMonths"),
+			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
+			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			drawMonth = inst.drawMonth - showCurrentAtPos,
+			drawYear = inst.drawYear;
+
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+
+		prevText = this._get(inst, "prevText");
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
+			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+ prevText +"'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w") + "'>" + prevText + "</span></a>"));
+
+		nextText = this._get(inst, "nextText");
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
+			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>" :
+			(hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+ nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e") + "'>" + nextText + "</span></a>"));
+
+		currentText = this._get(inst, "currentText");
+		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+
+		controls = (!inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
+			this._get(inst, "closeText") + "</button>" : "");
+
+		buttonPanel = (showButtonPanel) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + (isRTL ? controls : "") +
+			(this._isInRange(inst, gotoDate) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
+			">" + currentText + "</button>" : "") + (isRTL ? "" : controls) + "</div>" : "";
+
+		firstDay = parseInt(this._get(inst, "firstDay"),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+
+		showWeek = this._get(inst, "showWeek");
+		dayNames = this._get(inst, "dayNames");
+		dayNamesMin = this._get(inst, "dayNamesMin");
+		monthNames = this._get(inst, "monthNames");
+		monthNamesShort = this._get(inst, "monthNamesShort");
+		beforeShowDay = this._get(inst, "beforeShowDay");
+		showOtherMonths = this._get(inst, "showOtherMonths");
+		selectOtherMonths = this._get(inst, "selectOtherMonths");
+		defaultDate = this._getDefaultDate(inst);
+		html = "";
+		dow;
+		for (row = 0; row < numMonths[0]; row++) {
+			group = "";
+			this.maxRows = 4;
+			for (col = 0; col < numMonths[1]; col++) {
+				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				cornerClass = " ui-corner-all";
+				calender = "";
+				if (isMultiMonth) {
+					calender += "<div class='ui-datepicker-group";
+					if (numMonths[1] > 1) {
+						switch (col) {
+							case 0: calender += " ui-datepicker-group-first";
+								cornerClass = " ui-corner-" + (isRTL ? "right" : "left"); break;
+							case numMonths[1]-1: calender += " ui-datepicker-group-last";
+								cornerClass = " ui-corner-" + (isRTL ? "left" : "right"); break;
+							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
+						}
+					}
+					calender += "'>";
+				}
+				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
+					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
+					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					"</div><table class='ui-datepicker-calendar'><thead>" +
+					"<tr>";
+				thead = (showWeek ? "<th class='ui-datepicker-week-col'>" + this._get(inst, "weekHeader") + "</th>" : "");
+				for (dow = 0; dow < 7; dow++) { // days of the week
+					day = (dow + firstDay) % 7;
+					thead += "<th" + ((dow + firstDay + 6) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
+						"<span title='" + dayNames[day] + "'>" + dayNamesMin[day] + "</span></th>";
+				}
+				calender += thead + "</tr></thead><tbody>";
+				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				}
+				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += "<tr>";
+					tbody = (!showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
+						this._get(inst, "calculateWeek")(printDate) + "</td>");
+					for (dow = 0; dow < 7; dow++) { // create date picker days
+						daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
+						otherMonth = (printDate.getMonth() !== drawMonth);
+						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += "<td class='" +
+							((dow + firstDay + 6) % 7 >= 5 ? " ui-datepicker-week-end" : "") + // highlight weekends
+							(otherMonth ? " ui-datepicker-other-month" : "") + // highlight days from other months
+							((printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent) || // user pressed key
+							(defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime()) ?
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							" " + this._dayOverClass : "") + // highlight selected day
+							(unselectable ? " " + this._unselectableClass + " ui-state-disabled": "") +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? "" : " " + daySettings[1] + // highlight custom dates
+							(printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "") + // highlight selected day
+							(printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "")) + "'" + // highlight today (if different)
+							((!otherMonth || showOtherMonths) && daySettings[2] ? " title='" + daySettings[2] + "'" : "") + // cell title
+							(unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'") + ">" + // actions
+							(otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
+							(unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
+							(printDate.getTime() === today.getTime() ? " ui-state-highlight" : "") +
+							(printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "") + // highlight selected day
+							(otherMonth ? " ui-priority-secondary" : "") + // distinguish dates from other months
+							"' href='#'>" + printDate.getDate() + "</a>")) + "</td>"; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + "</tr>";
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += "</tbody></table>" + (isMultiMonth ? "</div>" +
+							((numMonths[0] > 0 && col === numMonths[1]-1) ? "<div class='ui-datepicker-row-break'></div>" : "") : "");
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel;
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+
+		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
+			changeMonth = this._get(inst, "changeMonth"),
+			changeYear = this._get(inst, "changeYear"),
+			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
+			html = "<div class='ui-datepicker-title'>",
+			monthHtml = "";
+
+		// month selection
+		if (secondary || !changeMonth) {
+			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[drawMonth] + "</span>";
+		} else {
+			inMinYear = (minDate && minDate.getFullYear() === drawYear);
+			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
+			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
+			for ( month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) && (!inMaxYear || month <= maxDate.getMonth())) {
+					monthHtml += "<option value='" + month + "'" +
+						(month === drawMonth ? " selected='selected'" : "") +
+						">" + monthNamesShort[month] + "</option>";
+				}
+			}
+			monthHtml += "</select>";
+		}
+
+		if (!showMonthAfterYear) {
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "");
+		}
+
+		// year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = "";
+			if (secondary || !changeYear) {
+				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
+			} else {
+				// determine range of years to display
+				years = this._get(inst, "yearRange").split(":");
+				thisYear = new Date().getFullYear();
+				determineYear = function(value) {
+					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
+						parseInt(value, 10)));
+					return (isNaN(year) ? thisYear : year);
+				};
+				year = determineYear(years[0]);
+				endYear = Math.max(year, determineYear(years[1] || ""));
+				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
+				for (; year <= endYear; year++) {
+					inst.yearshtml += "<option value='" + year + "'" +
+						(year === drawYear ? " selected='selected'" : "") +
+						">" + year + "</option>";
+				}
+				inst.yearshtml += "</select>";
+
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+
+		html += this._get(inst, "yearSuffix");
+		if (showMonthAfterYear) {
+			html += (secondary || !(changeMonth && changeYear) ? "&#xa0;" : "") + monthHtml;
+		}
+		html += "</div>"; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period === "Y" ? offset : 0),
+			month = inst.drawMonth + (period === "M" ? offset : 0),
+			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
+			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
+
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period === "M" || period === "Y") {
+			this._notifyChange(inst);
+		}
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			newDate = (minDate && date < minDate ? minDate : date);
+		return (maxDate && newDate > maxDate ? maxDate : newDate);
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, "onChangeMonthYear");
+		if (onChange) {
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+		}
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, "numberOfMonths");
+		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst),
+			date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+
+		if (offset < 0) {
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		}
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var yearSplit, currentYear,
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			minYear = null,
+			maxYear = null,
+			years = this._get(inst, "yearRange");
+			if (years){
+				yearSplit = years.split(":");
+				currentYear = new Date().getFullYear();
+				minYear = parseInt(yearSplit[0], 10) + currentYear;
+				maxYear = parseInt(yearSplit[1], 10) + currentYear;
+			}
+
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()) &&
+			(!minYear || date.getFullYear() >= minYear) &&
+			(!maxYear || date.getFullYear() <= maxYear));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, "shortYearCutoff");
+		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
+			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day === "object" ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
+	}
+});
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function bindHover(dpDiv) {
+	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
+	return dpDiv.delegate(selector, "mouseout", function() {
+			$(this).removeClass("ui-state-hover");
+			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+				$(this).removeClass("ui-datepicker-prev-hover");
+			}
+			if (this.className.indexOf("ui-datepicker-next") !== -1) {
+				$(this).removeClass("ui-datepicker-next-hover");
+			}
+		})
+		.delegate(selector, "mouseover", function(){
+			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
+				$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+				$(this).addClass("ui-state-hover");
+				if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+					$(this).addClass("ui-datepicker-prev-hover");
+				}
+				if (this.className.indexOf("ui-datepicker-next") !== -1) {
+					$(this).addClass("ui-datepicker-next-hover");
+				}
+			}
+		});
+}
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props) {
+		if (props[name] == null) {
+			target[name] = props[name];
+		}
+	}
+	return target;
+}
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+					Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick);
+		$.datepicker.initialized = true;
+	}
+
+	/* Append datepicker main container to body if not exist. */
+	if ($("#"+$.datepicker._mainDivId).length === 0) {
+		$("body").append($.datepicker.dpDiv);
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	return this.each(function() {
+		typeof options === "string" ?
+			$.datepicker["_" + options + "Datepicker"].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.10.0";
+
+// Workaround for #4055
+// Add another global to avoid noConflict issues with inline event handlers
+window["DP_jQuery_" + dpuuid] = $;
+
+})(jQuery);
+(function( $, undefined ) {
+
+var sizeRelatedOptions = {
+		buttons: true,
+		height: true,
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true,
+		width: true
+	},
+	resizableRelatedOptions = {
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true
+	};
+
+$.widget( "ui.dialog", {
+	version: "1.10.0",
+	options: {
+		appendTo: "body",
+		autoOpen: true,
+		buttons: [],
+		closeOnEscape: true,
+		closeText: "close",
+		dialogClass: "",
+		draggable: true,
+		hide: null,
+		height: "auto",
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: "center",
+			at: "center",
+			of: window,
+			collision: "fit",
+			// Ensure the titlebar is always visible
+			using: function( pos ) {
+				var topOffset = $( this ).css( pos ).offset().top;
+				if ( topOffset < 0 ) {
+					$( this ).css( "top", pos.top - topOffset );
+				}
+			}
+		},
+		resizable: true,
+		show: null,
+		title: null,
+		width: 300,
+
+		// callbacks
+		beforeClose: null,
+		close: null,
+		drag: null,
+		dragStart: null,
+		dragStop: null,
+		focus: null,
+		open: null,
+		resize: null,
+		resizeStart: null,
+		resizeStop: null
+	},
+
+	_create: function() {
+		this.originalCss = {
+			display: this.element[0].style.display,
+			width: this.element[0].style.width,
+			minHeight: this.element[0].style.minHeight,
+			maxHeight: this.element[0].style.maxHeight,
+			height: this.element[0].style.height
+		};
+		this.originalPosition = {
+			parent: this.element.parent(),
+			index: this.element.parent().children().index( this.element )
+		};
+		this.originalTitle = this.element.attr("title");
+		this.options.title = this.options.title || this.originalTitle;
+
+		this._createWrapper();
+
+		this.element
+			.show()
+			.removeAttr("title")
+			.addClass("ui-dialog-content ui-widget-content")
+			.appendTo( this.uiDialog );
+
+		this._createTitlebar();
+		this._createButtonPane();
+
+		if ( this.options.draggable && $.fn.draggable ) {
+			this._makeDraggable();
+		}
+		if ( this.options.resizable && $.fn.resizable ) {
+			this._makeResizable();
+		}
+
+		this._isOpen = false;
+	},
+
+	_init: function() {
+		if ( this.options.autoOpen ) {
+			this.open();
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+		if ( element && (element.jquery || element.nodeType) ) {
+			return $( element );
+		}
+		return this.document.find( element || "body" ).eq( 0 );
+	},
+
+	_destroy: function() {
+		var next,
+			originalPosition = this.originalPosition;
+
+		this._destroyOverlay();
+
+		this.element
+			.removeUniqueId()
+			.removeClass("ui-dialog-content ui-widget-content")
+			.css( this.originalCss )
+			// Without detaching first, the following becomes really slow
+			.detach();
+
+		this.uiDialog.stop( true, true ).remove();
+
+		if ( this.originalTitle ) {
+			this.element.attr( "title", this.originalTitle );
+		}
+
+		next = originalPosition.parent.children().eq( originalPosition.index );
+		// Don't try to place the dialog next to itself (#8613)
+		if ( next.length && next[0] !== this.element[0] ) {
+			next.before( this.element );
+		} else {
+			originalPosition.parent.append( this.element );
+		}
+	},
+
+	widget: function() {
+		return this.uiDialog;
+	},
+
+	disable: $.noop,
+	enable: $.noop,
+
+	close: function( event ) {
+		var that = this;
+
+		if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) {
+			return;
+		}
+
+		this._isOpen = false;
+		this._destroyOverlay();
+
+		if ( !this.opener.filter(":focusable").focus().length ) {
+			// Hiding a focused element doesn't trigger blur in WebKit
+			// so in case we have nothing to focus on, explicitly blur the active element
+			// https://bugs.webkit.org/show_bug.cgi?id=47182
+			$( this.document[0].activeElement ).blur();
+		}
+
+		this._hide( this.uiDialog, this.options.hide, function() {
+			that._trigger( "close", event );
+		});
+	},
+
+	isOpen: function() {
+		return this._isOpen;
+	},
+
+	moveToTop: function() {
+		this._moveToTop();
+	},
+
+	_moveToTop: function( event, silent ) {
+		var moved = !!this.uiDialog.nextAll(":visible").insertBefore( this.uiDialog ).length;
+		if ( moved && !silent ) {
+			this._trigger( "focus", event );
+		}
+		return moved;
+	},
+
+	open: function() {
+		if ( this._isOpen ) {
+			if ( this._moveToTop() ) {
+				this._focusTabbable();
+			}
+			return;
+		}
+
+		this.opener = $( this.document[0].activeElement );
+
+		this._size();
+		this._position();
+		this._createOverlay();
+		this._moveToTop( null, true );
+		this._show( this.uiDialog, this.options.show );
+
+		this._focusTabbable();
+
+		this._isOpen = true;
+		this._trigger("open");
+		this._trigger("focus");
+	},
+
+	_focusTabbable: function() {
+		// Set focus to the first match:
+		// 1. First element inside the dialog matching [autofocus]
+		// 2. Tabbable element inside the content element
+		// 3. Tabbable element inside the buttonpane
+		// 4. The close button
+		// 5. The dialog itself
+		var hasFocus = this.element.find("[autofocus]");
+		if ( !hasFocus.length ) {
+			hasFocus = this.element.find(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialogButtonPane.find(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialogTitlebarClose.filter(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialog;
+		}
+		hasFocus.eq( 0 ).focus();
+	},
+
+	_keepFocus: function( event ) {
+		function checkFocus() {
+			var activeElement = this.document[0].activeElement,
+				isActive = this.uiDialog[0] === activeElement ||
+					$.contains( this.uiDialog[0], activeElement );
+			if ( !isActive ) {
+				this._focusTabbable();
+			}
+		}
+		event.preventDefault();
+		checkFocus.call( this );
+		// support: IE
+		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
+		// so we check again later
+		this._delay( checkFocus );
+	},
+
+	_createWrapper: function() {
+		this.uiDialog = $("<div>")
+			.addClass( "ui-dialog ui-widget ui-widget-content ui-corner-all ui-front " +
+				this.options.dialogClass )
+			.hide()
+			.attr({
+				// Setting tabIndex makes the div focusable
+				tabIndex: -1,
+				role: "dialog"
+			})
+			.appendTo( this._appendTo() );
+
+		this._on( this.uiDialog, {
+			keydown: function( event ) {
+				if ( this.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
+						event.keyCode === $.ui.keyCode.ESCAPE ) {
+					event.preventDefault();
+					this.close( event );
+					return;
+				}
+
+				// prevent tabbing out of dialogs
+				if ( event.keyCode !== $.ui.keyCode.TAB ) {
+					return;
+				}
+				var tabbables = this.uiDialog.find(":tabbable"),
+					first = tabbables.filter(":first"),
+					last  = tabbables.filter(":last");
+
+				if ( ( event.target === last[0] || event.target === this.uiDialog[0] ) && !event.shiftKey ) {
+					first.focus( 1 );
+					event.preventDefault();
+				} else if ( ( event.target === first[0] || event.target === this.uiDialog[0] ) && event.shiftKey ) {
+					last.focus( 1 );
+					event.preventDefault();
+				}
+			},
+			mousedown: function( event ) {
+				if ( this._moveToTop( event ) ) {
+					this._focusTabbable();
+				}
+			}
+		});
+
+		// We assume that any existing aria-describedby attribute means
+		// that the dialog content is marked up properly
+		// otherwise we brute force the content as the description
+		if ( !this.element.find("[aria-describedby]").length ) {
+			this.uiDialog.attr({
+				"aria-describedby": this.element.uniqueId().attr("id")
+			});
+		}
+	},
+
+	_createTitlebar: function() {
+		var uiDialogTitle;
+
+		this.uiDialogTitlebar = $("<div>")
+			.addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix")
+			.prependTo( this.uiDialog );
+		this._on( this.uiDialogTitlebar, {
+			mousedown: function( event ) {
+				// Don't prevent click on close button (#8838)
+				// Focusing a dialog that is partially scrolled out of view
+				// causes the browser to scroll it into view, preventing the click event
+				if ( !$( event.target ).closest(".ui-dialog-titlebar-close") ) {
+					// Dialog isn't getting focus when dragging (#8063)
+					this.uiDialog.focus();
+				}
+			}
+		});
+
+		this.uiDialogTitlebarClose = $("<button></button>")
+			.button({
+				label: this.options.closeText,
+				icons: {
+					primary: "ui-icon-closethick"
+				},
+				text: false
+			})
+			.addClass("ui-dialog-titlebar-close")
+			.appendTo( this.uiDialogTitlebar );
+		this._on( this.uiDialogTitlebarClose, {
+			click: function( event ) {
+				event.preventDefault();
+				this.close( event );
+			}
+		});
+
+		uiDialogTitle = $("<span>")
+			.uniqueId()
+			.addClass("ui-dialog-title")
+			.prependTo( this.uiDialogTitlebar );
+		this._title( uiDialogTitle );
+
+		this.uiDialog.attr({
+			"aria-labelledby": uiDialogTitle.attr("id")
+		});
+	},
+
+	_title: function( title ) {
+		if ( !this.options.title ) {
+			title.html("&#160;");
+		}
+		title.text( this.options.title );
+	},
+
+	_createButtonPane: function() {
+		this.uiDialogButtonPane = $("<div>")
+			.addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix");
+
+		this.uiButtonSet = $("<div>")
+			.addClass("ui-dialog-buttonset")
+			.appendTo( this.uiDialogButtonPane );
+
+		this._createButtons();
+	},
+
+	_createButtons: function() {
+		var that = this,
+			buttons = this.options.buttons;
+
+		// if we already have a button pane, remove it
+		this.uiDialogButtonPane.remove();
+		this.uiButtonSet.empty();
+
+		if ( $.isEmptyObject( buttons ) ) {
+			this.uiDialog.removeClass("ui-dialog-buttons");
+			return;
+		}
+
+		$.each( buttons, function( name, props ) {
+			var click, buttonOptions;
+			props = $.isFunction( props ) ?
+				{ click: props, text: name } :
+				props;
+			// Default to a non-submitting button
+			props = $.extend( { type: "button" }, props );
+			// Change the context for the click callback to be the main element
+			click = props.click;
+			props.click = function() {
+				click.apply( that.element[0], arguments );
+			};
+			buttonOptions = {
+				icons: props.icons,
+				text: props.showText
+			};
+			delete props.icons;
+			delete props.showText;
+			$( "<button></button>", props )
+				.button( buttonOptions )
+				.appendTo( that.uiButtonSet );
+		});
+		this.uiDialog.addClass("ui-dialog-buttons");
+		this.uiDialogButtonPane.appendTo( this.uiDialog );
+	},
+
+	_makeDraggable: function() {
+		var that = this,
+			options = this.options;
+
+		function filteredUi( ui ) {
+			return {
+				position: ui.position,
+				offset: ui.offset
+			};
+		}
+
+		this.uiDialog.draggable({
+			cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
+			handle: ".ui-dialog-titlebar",
+			containment: "document",
+			start: function( event, ui ) {
+				$( this ).addClass("ui-dialog-dragging");
+				that._trigger( "dragStart", event, filteredUi( ui ) );
+			},
+			drag: function( event, ui ) {
+				that._trigger( "drag", event, filteredUi( ui ) );
+			},
+			stop: function( event, ui ) {
+				options.position = [
+					ui.position.left - that.document.scrollLeft(),
+					ui.position.top - that.document.scrollTop()
+				];
+				$( this ).removeClass("ui-dialog-dragging");
+				that._trigger( "dragStop", event, filteredUi( ui ) );
+			}
+		});
+	},
+
+	_makeResizable: function() {
+		var that = this,
+			options = this.options,
+			handles = options.resizable,
+			// .ui-resizable has position: relative defined in the stylesheet
+			// but dialogs have to use absolute or fixed positioning
+			position = this.uiDialog.css("position"),
+			resizeHandles = typeof handles === "string" ?
+				handles	:
+				"n,e,s,w,se,sw,ne,nw";
+
+		function filteredUi( ui ) {
+			return {
+				originalPosition: ui.originalPosition,
+				originalSize: ui.originalSize,
+				position: ui.position,
+				size: ui.size
+			};
+		}
+
+		this.uiDialog.resizable({
+			cancel: ".ui-dialog-content",
+			containment: "document",
+			alsoResize: this.element,
+			maxWidth: options.maxWidth,
+			maxHeight: options.maxHeight,
+			minWidth: options.minWidth,
+			minHeight: this._minHeight(),
+			handles: resizeHandles,
+			start: function( event, ui ) {
+				$( this ).addClass("ui-dialog-resizing");
+				that._trigger( "resizeStart", event, filteredUi( ui ) );
+			},
+			resize: function( event, ui ) {
+				that._trigger( "resize", event, filteredUi( ui ) );
+			},
+			stop: function( event, ui ) {
+				options.height = $( this ).height();
+				options.width = $( this ).width();
+				$( this ).removeClass("ui-dialog-resizing");
+				that._trigger( "resizeStop", event, filteredUi( ui ) );
+			}
+		})
+		.css( "position", position );
+	},
+
+	_minHeight: function() {
+		var options = this.options;
+
+		return options.height === "auto" ?
+			options.minHeight :
+			Math.min( options.minHeight, options.height );
+	},
+
+	_position: function() {
+		// Need to show the dialog to get the actual offset in the position plugin
+		var isVisible = this.uiDialog.is(":visible");
+		if ( !isVisible ) {
+			this.uiDialog.show();
+		}
+		this.uiDialog.position( this.options.position );
+		if ( !isVisible ) {
+			this.uiDialog.hide();
+		}
+	},
+
+	_setOptions: function( options ) {
+		var that = this,
+			resize = false,
+			resizableOptions = {};
+
+		$.each( options, function( key, value ) {
+			that._setOption( key, value );
+
+			if ( key in sizeRelatedOptions ) {
+				resize = true;
+			}
+			if ( key in resizableRelatedOptions ) {
+				resizableOptions[ key ] = value;
+			}
+		});
+
+		if ( resize ) {
+			this._size();
+			this._position();
+		}
+		if ( this.uiDialog.is(":data(ui-resizable)") ) {
+			this.uiDialog.resizable( "option", resizableOptions );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		/*jshint maxcomplexity:15*/
+		var isDraggable, isResizable,
+			uiDialog = this.uiDialog;
+
+		if ( key === "dialogClass" ) {
+			uiDialog
+				.removeClass( this.options.dialogClass )
+				.addClass( value );
+		}
+
+		if ( key === "disabled" ) {
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "appendTo" ) {
+			this.uiDialog.appendTo( this._appendTo() );
+		}
+
+		if ( key === "buttons" ) {
+			this._createButtons();
+		}
+
+		if ( key === "closeText" ) {
+			this.uiDialogTitlebarClose.button({
+				// Ensure that we always pass a string
+				label: "" + value
+			});
+		}
+
+		if ( key === "draggable" ) {
+			isDraggable = uiDialog.is(":data(ui-draggable)");
+			if ( isDraggable && !value ) {
+				uiDialog.draggable("destroy");
+			}
+
+			if ( !isDraggable && value ) {
+				this._makeDraggable();
+			}
+		}
+
+		if ( key === "position" ) {
+			this._position();
+		}
+
+		if ( key === "resizable" ) {
+			// currently resizable, becoming non-resizable
+			isResizable = uiDialog.is(":data(ui-resizable)");
+			if ( isResizable && !value ) {
+				uiDialog.resizable("destroy");
+			}
+
+			// currently resizable, changing handles
+			if ( isResizable && typeof value === "string" ) {
+				uiDialog.resizable( "option", "handles", value );
+			}
+
+			// currently non-resizable, becoming resizable
+			if ( !isResizable && value !== false ) {
+				this._makeResizable();
+			}
+		}
+
+		if ( key === "title" ) {
+			this._title( this.uiDialogTitlebar.find(".ui-dialog-title") );
+		}
+	},
+
+	_size: function() {
+		// If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
+		// divs will both have width and height set, so we need to reset them
+		var nonContentHeight, minContentHeight, maxContentHeight,
+			options = this.options;
+
+		// Reset content sizing
+		this.element.show().css({
+			width: "auto",
+			minHeight: 0,
+			maxHeight: "none",
+			height: 0
+		});
+
+		if ( options.minWidth > options.width ) {
+			options.width = options.minWidth;
+		}
+
+		// reset wrapper sizing
+		// determine the height of all the non-content elements
+		nonContentHeight = this.uiDialog.css({
+				height: "auto",
+				width: options.width
+			})
+			.outerHeight();
+		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+		maxContentHeight = typeof options.maxHeight === "number" ?
+			Math.max( 0, options.maxHeight - nonContentHeight ) :
+			"none";
+
+		if ( options.height === "auto" ) {
+			this.element.css({
+				minHeight: minContentHeight,
+				maxHeight: maxContentHeight,
+				height: "auto"
+			});
+		} else {
+			this.element.height( Math.max( 0, options.height - nonContentHeight ) );
+		}
+
+		if (this.uiDialog.is(":data(ui-resizable)") ) {
+			this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
+		}
+	},
+
+	_createOverlay: function() {
+		if ( !this.options.modal ) {
+			return;
+		}
+
+		if ( !$.ui.dialog.overlayInstances ) {
+			// Prevent use of anchors and inputs.
+			// We use a delay in case the overlay is created from an
+			// event that we're going to be cancelling. (#2804)
+			this._delay(function() {
+				// Handle .dialog().dialog("close") (#4065)
+				if ( $.ui.dialog.overlayInstances ) {
+					this._on( this.document, {
+						focusin: function( event ) {
+							if ( !$( event.target ).closest(".ui-dialog").length ) {
+								event.preventDefault();
+								$(".ui-dialog:visible:last .ui-dialog-content")
+									.data("ui-dialog")._focusTabbable();
+							}
+						}
+					});
+				}
+			});
+		}
+
+		this.overlay = $("<div>")
+			.addClass("ui-widget-overlay ui-front")
+			.appendTo( this.document[0].body );
+		this._on( this.overlay, {
+			mousedown: "_keepFocus"
+		});
+		$.ui.dialog.overlayInstances++;
+	},
+
+	_destroyOverlay: function() {
+		if ( !this.options.modal ) {
+			return;
+		}
+
+		$.ui.dialog.overlayInstances--;
+		if ( !$.ui.dialog.overlayInstances ) {
+			this._off( this.document, "focusin" );
+		}
+		this.overlay.remove();
+	}
+});
+
+$.ui.dialog.overlayInstances = 0;
+
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+	// position option with array notation
+	// just override with old implementation
+	$.widget( "ui.dialog", $.ui.dialog, {
+		_position: function() {
+			var position = this.options.position,
+				myAt = [],
+				offset = [ 0, 0 ],
+				isVisible;
+
+			if ( position ) {
+				if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
+					myAt = position.split ? position.split(" ") : [ position[0], position[1] ];
+					if ( myAt.length === 1 ) {
+						myAt[1] = myAt[0];
+					}
+
+					$.each( [ "left", "top" ], function( i, offsetPosition ) {
+						if ( +myAt[ i ] === myAt[ i ] ) {
+							offset[ i ] = myAt[ i ];
+							myAt[ i ] = offsetPosition;
+						}
+					});
+
+					position = {
+						my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
+							myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
+						at: myAt.join(" ")
+					};
+				}
+
+				position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
+			} else {
+				position = $.ui.dialog.prototype.options.position;
+			}
+
+			// need to show the dialog to get the actual offset in the position plugin
+			isVisible = this.uiDialog.is(":visible");
+			if ( !isVisible ) {
+				this.uiDialog.show();
+			}
+			this.uiDialog.position( position );
+			if ( !isVisible ) {
+				this.uiDialog.hide();
+			}
+		}
+	});
+}
+
+}( jQuery ) );
+(function( $, undefined ) {
+
+$.widget( "ui.menu", {
+	version: "1.10.0",
+	defaultElement: "<ul>",
+	delay: 300,
+	options: {
+		icons: {
+			submenu: "ui-icon-carat-1-e"
+		},
+		menus: "ul",
+		position: {
+			my: "left top",
+			at: "right top"
+		},
+		role: "menu",
+
+		// callbacks
+		blur: null,
+		focus: null,
+		select: null
+	},
+
+	_create: function() {
+		this.activeMenu = this.element;
+		// flag used to prevent firing of the click handler
+		// as the event bubbles up through nested menus
+		this.mouseHandled = false;
+		this.element
+			.uniqueId()
+			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
+			.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length )
+			.attr({
+				role: this.options.role,
+				tabIndex: 0
+			})
+			// need to catch all clicks on disabled menu
+			// not possible through _on
+			.bind( "click" + this.eventNamespace, $.proxy(function( event ) {
+				if ( this.options.disabled ) {
+					event.preventDefault();
+				}
+			}, this ));
+
+		if ( this.options.disabled ) {
+			this.element
+				.addClass( "ui-state-disabled" )
+				.attr( "aria-disabled", "true" );
+		}
+
+		this._on({
+			// Prevent focus from sticking to links inside menu after clicking
+			// them (focus should always stay on UL during navigation).
+			"mousedown .ui-menu-item > a": function( event ) {
+				event.preventDefault();
+			},
+			"click .ui-state-disabled > a": function( event ) {
+				event.preventDefault();
+			},
+			"click .ui-menu-item:has(a)": function( event ) {
+				var target = $( event.target ).closest( ".ui-menu-item" );
+				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
+					this.mouseHandled = true;
+
+					this.select( event );
+					// Open submenu on click
+					if ( target.has( ".ui-menu" ).length ) {
+						this.expand( event );
+					} else if ( !this.element.is( ":focus" ) ) {
+						// Redirect focus to the menu
+						this.element.trigger( "focus", [ true ] );
+
+						// If the active item is on the top level, let it stay active.
+						// Otherwise, blur the active item since it is no longer visible.
+						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
+							clearTimeout( this.timer );
+						}
+					}
+				}
+			},
+			"mouseenter .ui-menu-item": function( event ) {
+				var target = $( event.currentTarget );
+				// Remove ui-state-active class from siblings of the newly focused menu item
+				// to avoid a jump caused by adjacent elements both having a class with a border
+				target.siblings().children( ".ui-state-active" ).removeClass( "ui-state-active" );
+				this.focus( event, target );
+			},
+			mouseleave: "collapseAll",
+			"mouseleave .ui-menu": "collapseAll",
+			focus: function( event, keepActiveItem ) {
+				// If there's already an active item, keep it active
+				// If not, activate the first item
+				var item = this.active || this.element.children( ".ui-menu-item" ).eq( 0 );
+
+				if ( !keepActiveItem ) {
+					this.focus( event, item );
+				}
+			},
+			blur: function( event ) {
+				this._delay(function() {
+					if ( !$.contains( this.element[0], this.document[0].activeElement ) ) {
+						this.collapseAll( event );
+					}
+				});
+			},
+			keydown: "_keydown"
+		});
+
+		this.refresh();
+
+		// Clicks outside of a menu collapse any open menus
+		this._on( this.document, {
+			click: function( event ) {
+				if ( !$( event.target ).closest( ".ui-menu" ).length ) {
+					this.collapseAll( event );
+				}
+
+				// Reset the mouseHandled flag
+				this.mouseHandled = false;
+			}
+		});
+	},
+
+	_destroy: function() {
+		// Destroy (sub)menus
+		this.element
+			.removeAttr( "aria-activedescendant" )
+			.find( ".ui-menu" ).addBack()
+				.removeClass( "ui-menu ui-widget ui-widget-content ui-corner-all ui-menu-icons" )
+				.removeAttr( "role" )
+				.removeAttr( "tabIndex" )
+				.removeAttr( "aria-labelledby" )
+				.removeAttr( "aria-expanded" )
+				.removeAttr( "aria-hidden" )
+				.removeAttr( "aria-disabled" )
+				.removeUniqueId()
+				.show();
+
+		// Destroy menu items
+		this.element.find( ".ui-menu-item" )
+			.removeClass( "ui-menu-item" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-disabled" )
+			.children( "a" )
+				.removeUniqueId()
+				.removeClass( "ui-corner-all ui-state-hover" )
+				.removeAttr( "tabIndex" )
+				.removeAttr( "role" )
+				.removeAttr( "aria-haspopup" )
+				.children().each( function() {
+					var elem = $( this );
+					if ( elem.data( "ui-menu-submenu-carat" ) ) {
+						elem.remove();
+					}
+				});
+
+		// Destroy menu dividers
+		this.element.find( ".ui-menu-divider" ).removeClass( "ui-menu-divider ui-widget-content" );
+	},
+
+	_keydown: function( event ) {
+		/*jshint maxcomplexity:20*/
+		var match, prev, character, skip, regex,
+			preventDefault = true;
+
+		function escape( value ) {
+			return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
+		}
+
+		switch ( event.keyCode ) {
+		case $.ui.keyCode.PAGE_UP:
+			this.previousPage( event );
+			break;
+		case $.ui.keyCode.PAGE_DOWN:
+			this.nextPage( event );
+			break;
+		case $.ui.keyCode.HOME:
+			this._move( "first", "first", event );
+			break;
+		case $.ui.keyCode.END:
+			this._move( "last", "last", event );
+			break;
+		case $.ui.keyCode.UP:
+			this.previous( event );
+			break;
+		case $.ui.keyCode.DOWN:
+			this.next( event );
+			break;
+		case $.ui.keyCode.LEFT:
+			this.collapse( event );
+			break;
+		case $.ui.keyCode.RIGHT:
+			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+				this.expand( event );
+			}
+			break;
+		case $.ui.keyCode.ENTER:
+		case $.ui.keyCode.SPACE:
+			this._activate( event );
+			break;
+		case $.ui.keyCode.ESCAPE:
+			this.collapse( event );
+			break;
+		default:
+			preventDefault = false;
+			prev = this.previousFilter || "";
+			character = String.fromCharCode( event.keyCode );
+			skip = false;
+
+			clearTimeout( this.filterTimer );
+
+			if ( character === prev ) {
+				skip = true;
+			} else {
+				character = prev + character;
+			}
+
+			regex = new RegExp( "^" + escape( character ), "i" );
+			match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
+				return regex.test( $( this ).children( "a" ).text() );
+			});
+			match = skip && match.index( this.active.next() ) !== -1 ?
+				this.active.nextAll( ".ui-menu-item" ) :
+				match;
+
+			// If no matches on the current filter, reset to the last character pressed
+			// to move down the menu to the first item that starts with that character
+			if ( !match.length ) {
+				character = String.fromCharCode( event.keyCode );
+				regex = new RegExp( "^" + escape( character ), "i" );
+				match = this.activeMenu.children( ".ui-menu-item" ).filter(function() {
+					return regex.test( $( this ).children( "a" ).text() );
+				});
+			}
+
+			if ( match.length ) {
+				this.focus( event, match );
+				if ( match.length > 1 ) {
+					this.previousFilter = character;
+					this.filterTimer = this._delay(function() {
+						delete this.previousFilter;
+					}, 1000 );
+				} else {
+					delete this.previousFilter;
+				}
+			} else {
+				delete this.previousFilter;
+			}
+		}
+
+		if ( preventDefault ) {
+			event.preventDefault();
+		}
+	},
+
+	_activate: function( event ) {
+		if ( !this.active.is( ".ui-state-disabled" ) ) {
+			if ( this.active.children( "a[aria-haspopup='true']" ).length ) {
+				this.expand( event );
+			} else {
+				this.select( event );
+			}
+		}
+	},
+
+	refresh: function() {
+		var menus,
+			icon = this.options.icons.submenu,
+			submenus = this.element.find( this.options.menus );
+
+		// Initialize nested menus
+		submenus.filter( ":not(.ui-menu)" )
+			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
+			.hide()
+			.attr({
+				role: this.options.role,
+				"aria-hidden": "true",
+				"aria-expanded": "false"
+			})
+			.each(function() {
+				var menu = $( this ),
+					item = menu.prev( "a" ),
+					submenuCarat = $( "<span>" )
+						.addClass( "ui-menu-icon ui-icon " + icon )
+						.data( "ui-menu-submenu-carat", true );
+
+				item
+					.attr( "aria-haspopup", "true" )
+					.prepend( submenuCarat );
+				menu.attr( "aria-labelledby", item.attr( "id" ) );
+			});
+
+		menus = submenus.add( this.element );
+
+		// Don't refresh list items that are already adapted
+		menus.children( ":not(.ui-menu-item):has(a)" )
+			.addClass( "ui-menu-item" )
+			.attr( "role", "presentation" )
+			.children( "a" )
+				.uniqueId()
+				.addClass( "ui-corner-all" )
+				.attr({
+					tabIndex: -1,
+					role: this._itemRole()
+				});
+
+		// Initialize unlinked menu-items containing spaces and/or dashes only as dividers
+		menus.children( ":not(.ui-menu-item)" ).each(function() {
+			var item = $( this );
+			// hyphen, em dash, en dash
+			if ( !/[^\-â€”â€“\s]/.test( item.text() ) ) {
+				item.addClass( "ui-widget-content ui-menu-divider" );
+			}
+		});
+
+		// Add aria-disabled attribute to any disabled menu item
+		menus.children( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
+
+		// If the active item has been removed, blur the menu
+		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+			this.blur();
+		}
+	},
+
+	_itemRole: function() {
+		return {
+			menu: "menuitem",
+			listbox: "option"
+		}[ this.options.role ];
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "icons" ) {
+			this.element.find( ".ui-menu-icon" )
+				.removeClass( this.options.icons.submenu )
+				.addClass( value.submenu );
+		}
+		this._super( key, value );
+	},
+
+	focus: function( event, item ) {
+		var nested, focused;
+		this.blur( event, event && event.type === "focus" );
+
+		this._scrollIntoView( item );
+
+		this.active = item.first();
+		focused = this.active.children( "a" ).addClass( "ui-state-focus" );
+		// Only update aria-activedescendant if there's a role
+		// otherwise we assume focus is managed elsewhere
+		if ( this.options.role ) {
+			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
+		}
+
+		// Highlight active parent menu item, if any
+		this.active
+			.parent()
+			.closest( ".ui-menu-item" )
+			.children( "a:first" )
+			.addClass( "ui-state-active" );
+
+		if ( event && event.type === "keydown" ) {
+			this._close();
+		} else {
+			this.timer = this._delay(function() {
+				this._close();
+			}, this.delay );
+		}
+
+		nested = item.children( ".ui-menu" );
+		if ( nested.length && ( /^mouse/.test( event.type ) ) ) {
+			this._startOpening(nested);
+		}
+		this.activeMenu = item.parent();
+
+		this._trigger( "focus", event, { item: item } );
+	},
+
+	_scrollIntoView: function( item ) {
+		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+		if ( this._hasScroll() ) {
+			borderTop = parseFloat( $.css( this.activeMenu[0], "borderTopWidth" ) ) || 0;
+			paddingTop = parseFloat( $.css( this.activeMenu[0], "paddingTop" ) ) || 0;
+			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+			scroll = this.activeMenu.scrollTop();
+			elementHeight = this.activeMenu.height();
+			itemHeight = item.height();
+
+			if ( offset < 0 ) {
+				this.activeMenu.scrollTop( scroll + offset );
+			} else if ( offset + itemHeight > elementHeight ) {
+				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+			}
+		}
+	},
+
+	blur: function( event, fromFocus ) {
+		if ( !fromFocus ) {
+			clearTimeout( this.timer );
+		}
+
+		if ( !this.active ) {
+			return;
+		}
+
+		this.active.children( "a" ).removeClass( "ui-state-focus" );
+		this.active = null;
+
+		this._trigger( "blur", event, { item: this.active } );
+	},
+
+	_startOpening: function( submenu ) {
+		clearTimeout( this.timer );
+
+		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
+		// shift in the submenu position when mousing over the carat icon
+		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
+			return;
+		}
+
+		this.timer = this._delay(function() {
+			this._close();
+			this._open( submenu );
+		}, this.delay );
+	},
+
+	_open: function( submenu ) {
+		var position = $.extend({
+			of: this.active
+		}, this.options.position );
+
+		clearTimeout( this.timer );
+		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
+			.hide()
+			.attr( "aria-hidden", "true" );
+
+		submenu
+			.show()
+			.removeAttr( "aria-hidden" )
+			.attr( "aria-expanded", "true" )
+			.position( position );
+	},
+
+	collapseAll: function( event, all ) {
+		clearTimeout( this.timer );
+		this.timer = this._delay(function() {
+			// If we were passed an event, look for the submenu that contains the event
+			var currentMenu = all ? this.element :
+				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
+
+			// If we found no valid submenu ancestor, use the main menu to close all sub menus anyway
+			if ( !currentMenu.length ) {
+				currentMenu = this.element;
+			}
+
+			this._close( currentMenu );
+
+			this.blur( event );
+			this.activeMenu = currentMenu;
+		}, this.delay );
+	},
+
+	// With no arguments, closes the currently active menu - if nothing is active
+	// it closes all menus.  If passed an argument, it will search for menus BELOW
+	_close: function( startMenu ) {
+		if ( !startMenu ) {
+			startMenu = this.active ? this.active.parent() : this.element;
+		}
+
+		startMenu
+			.find( ".ui-menu" )
+				.hide()
+				.attr( "aria-hidden", "true" )
+				.attr( "aria-expanded", "false" )
+			.end()
+			.find( "a.ui-state-active" )
+				.removeClass( "ui-state-active" );
+	},
+
+	collapse: function( event ) {
+		var newItem = this.active &&
+			this.active.parent().closest( ".ui-menu-item", this.element );
+		if ( newItem && newItem.length ) {
+			this._close();
+			this.focus( event, newItem );
+		}
+	},
+
+	expand: function( event ) {
+		var newItem = this.active &&
+			this.active
+				.children( ".ui-menu " )
+				.children( ".ui-menu-item" )
+				.first();
+
+		if ( newItem && newItem.length ) {
+			this._open( newItem.parent() );
+
+			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+			this._delay(function() {
+				this.focus( event, newItem );
+			});
+		}
+	},
+
+	next: function( event ) {
+		this._move( "next", "first", event );
+	},
+
+	previous: function( event ) {
+		this._move( "prev", "last", event );
+	},
+
+	isFirstItem: function() {
+		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
+	},
+
+	isLastItem: function() {
+		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
+	},
+
+	_move: function( direction, filter, event ) {
+		var next;
+		if ( this.active ) {
+			if ( direction === "first" || direction === "last" ) {
+				next = this.active
+					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
+					.eq( -1 );
+			} else {
+				next = this.active
+					[ direction + "All" ]( ".ui-menu-item" )
+					.eq( 0 );
+			}
+		}
+		if ( !next || !next.length || !this.active ) {
+			next = this.activeMenu.children( ".ui-menu-item" )[ filter ]();
+		}
+
+		this.focus( event, next );
+	},
+
+	nextPage: function( event ) {
+		var item, base, height;
+
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isLastItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.height();
+			this.active.nextAll( ".ui-menu-item" ).each(function() {
+				item = $( this );
+				return item.offset().top - base - height < 0;
+			});
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this.activeMenu.children( ".ui-menu-item" )
+				[ !this.active ? "first" : "last" ]() );
+		}
+	},
+
+	previousPage: function( event ) {
+		var item, base, height;
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isFirstItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.height();
+			this.active.prevAll( ".ui-menu-item" ).each(function() {
+				item = $( this );
+				return item.offset().top - base + height > 0;
+			});
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this.activeMenu.children( ".ui-menu-item" ).first() );
+		}
+	},
+
+	_hasScroll: function() {
+		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
+	},
+
+	select: function( event ) {
+		// TODO: It should never be possible to not have an active item at this
+		// point, but the tests don't trigger mouseenter before click.
+		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+		var ui = { item: this.active };
+		if ( !this.active.has( ".ui-menu" ).length ) {
+			this.collapseAll( event, true );
+		}
+		this._trigger( "select", event, ui );
+	}
+});
+
+}( jQuery ));
+(function( $, undefined ) {
+
+$.widget( "ui.progressbar", {
+	version: "1.10.0",
+	options: {
+		max: 100,
+		value: 0,
+
+		change: null,
+		complete: null
+	},
+
+	min: 0,
+
+	_create: function() {
+		// Constrain initial value
+		this.oldValue = this.options.value = this._constrainedValue();
+
+		this.element
+			.addClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.attr({
+				// Only set static values, aria-valuenow and aria-valuemax are
+				// set inside _refreshValue()
+				role: "progressbar",
+				"aria-valuemin": this.min
+			});
+
+		this.valueDiv = $( "<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>" )
+			.appendTo( this.element );
+
+		this._refreshValue();
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass( "ui-progressbar ui-widget ui-widget-content ui-corner-all" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-valuemin" )
+			.removeAttr( "aria-valuemax" )
+			.removeAttr( "aria-valuenow" );
+
+		this.valueDiv.remove();
+	},
+
+	value: function( newValue ) {
+		if ( newValue === undefined ) {
+			return this.options.value;
+		}
+
+		this.options.value = this._constrainedValue( newValue );
+		this._refreshValue();
+	},
+
+	_constrainedValue: function( newValue ) {
+		if ( newValue === undefined ) {
+			newValue = this.options.value;
+		}
+
+		this.indeterminate = newValue === false;
+
+		// sanitize value
+		if ( typeof newValue !== "number" ) {
+			newValue = 0;
+		}
+
+		return this.indeterminate ? false :
+			Math.min( this.options.max, Math.max( this.min, newValue ) );
+	},
+
+	_setOptions: function( options ) {
+		// Ensure "value" option is set after other values (like max)
+		var value = options.value;
+		delete options.value;
+
+		this._super( options );
+
+		this.options.value = this._constrainedValue( value );
+		this._refreshValue();
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "max" ) {
+			// Don't allow a max less than min
+			value = Math.max( this.min, value );
+		}
+
+		this._super( key, value );
+	},
+
+	_percentage: function() {
+		return this.indeterminate ? 100 : 100 * ( this.options.value - this.min ) / ( this.options.max - this.min );
+	},
+
+	_refreshValue: function() {
+		var value = this.options.value,
+			percentage = this._percentage();
+
+		this.valueDiv
+			.toggle( this.indeterminate || value > this.min )
+			.toggleClass( "ui-corner-right", value === this.options.max )
+			.width( percentage.toFixed(0) + "%" );
+
+		this.element.toggleClass( "ui-progressbar-indeterminate", this.indeterminate );
+
+		if ( this.indeterminate ) {
+			this.element.removeAttr( "aria-valuenow" );
+			if ( !this.overlayDiv ) {
+				this.overlayDiv = $( "<div class='ui-progressbar-overlay'></div>" ).appendTo( this.valueDiv );
+			}
+		} else {
+			this.element.attr({
+				"aria-valuemax": this.options.max,
+				"aria-valuenow": value
+			});
+			if ( this.overlayDiv ) {
+				this.overlayDiv.remove();
+				this.overlayDiv = null;
+			}
+		}
+
+		if ( this.oldValue !== value ) {
+			this.oldValue = value;
+			this._trigger( "change" );
+		}
+		if ( value === this.options.max ) {
+			this._trigger( "complete" );
+		}
+	}
+});
+
+})( jQuery );
+(function( $, undefined ) {
+
+// number of pages in a slider
+// (how many times can you page up/down to go through the whole range)
+var numPages = 5;
+
+$.widget( "ui.slider", $.ui.mouse, {
+	version: "1.10.0",
+	widgetEventPrefix: "slide",
+
+	options: {
+		animate: false,
+		distance: 0,
+		max: 100,
+		min: 0,
+		orientation: "horizontal",
+		range: false,
+		step: 1,
+		value: 0,
+		values: null,
+
+		// callbacks
+		change: null,
+		slide: null,
+		start: null,
+		stop: null
+	},
+
+	_create: function() {
+		var i, handleCount,
+			o = this.options,
+			existingHandles = this.element.find( ".ui-slider-handle" ).addClass( "ui-state-default ui-corner-all" ),
+			handle = "<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>",
+			handles = [];
+
+		this._keySliding = false;
+		this._mouseSliding = false;
+		this._animateOff = true;
+		this._handleIndex = null;
+		this._detectOrientation();
+		this._mouseInit();
+
+		this.element
+			.addClass( "ui-slider" +
+				" ui-slider-" + this.orientation +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all");
+
+		this.range = $([]);
+
+		if ( o.range ) {
+			if ( o.range === true ) {
+				if ( !o.values ) {
+					o.values = [ this._valueMin(), this._valueMin() ];
+				} else if ( o.values.length && o.values.length !== 2 ) {
+					o.values = [ o.values[0], o.values[0] ];
+				} else if ( $.isArray( o.values ) ) {
+					o.values = o.values.slice(0);
+				}
+			}
+
+			this.range = $( "<div></div>" )
+				.appendTo( this.element )
+				.addClass( "ui-slider-range" +
+				// note: this isn't the most fittingly semantic framework class for this element,
+				// but worked best visually with a variety of themes
+				" ui-widget-header" +
+				( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) );
+		}
+
+		handleCount = ( o.values && o.values.length ) || 1;
+
+		for ( i = existingHandles.length; i < handleCount; i++ ) {
+			handles.push( handle );
+		}
+
+		this.handles = existingHandles.add( $( handles.join( "" ) ).appendTo( this.element ) );
+
+		this.handle = this.handles.eq( 0 );
+
+		this.handles.add( this.range ).filter( "a" )
+			.click(function( event ) {
+				event.preventDefault();
+			})
+			.mouseenter(function() {
+				if ( !o.disabled ) {
+					$( this ).addClass( "ui-state-hover" );
+				}
+			})
+			.mouseleave(function() {
+				$( this ).removeClass( "ui-state-hover" );
+			})
+			.focus(function() {
+				if ( !o.disabled ) {
+					$( ".ui-slider .ui-state-focus" ).removeClass( "ui-state-focus" );
+					$( this ).addClass( "ui-state-focus" );
+				} else {
+					$( this ).blur();
+				}
+			})
+			.blur(function() {
+				$( this ).removeClass( "ui-state-focus" );
+			});
+
+		this.handles.each(function( i ) {
+			$( this ).data( "ui-slider-handle-index", i );
+		});
+
+		this._setOption( "disabled", o.disabled );
+
+		this._on( this.handles, this._handleEvents );
+
+		this._refreshValue();
+
+		this._animateOff = false;
+	},
+
+	_destroy: function() {
+		this.handles.remove();
+		this.range.remove();
+
+		this.element
+			.removeClass( "ui-slider" +
+				" ui-slider-horizontal" +
+				" ui-slider-vertical" +
+				" ui-widget" +
+				" ui-widget-content" +
+				" ui-corner-all" );
+
+		this._mouseDestroy();
+	},
+
+	_mouseCapture: function( event ) {
+		var position, normValue, distance, closestHandle, index, allowed, offset, mouseOverHandle,
+			that = this,
+			o = this.options;
+
+		if ( o.disabled ) {
+			return false;
+		}
+
+		this.elementSize = {
+			width: this.element.outerWidth(),
+			height: this.element.outerHeight()
+		};
+		this.elementOffset = this.element.offset();
+
+		position = { x: event.pageX, y: event.pageY };
+		normValue = this._normValueFromMouse( position );
+		distance = this._valueMax() - this._valueMin() + 1;
+		this.handles.each(function( i ) {
+			var thisDistance = Math.abs( normValue - that.values(i) );
+			if (( distance > thisDistance ) ||
+				( distance === thisDistance &&
+					(i === that._lastChangedValue || that.values(i) === o.min ))) {
+				distance = thisDistance;
+				closestHandle = $( this );
+				index = i;
+			}
+		});
+
+		allowed = this._start( event, index );
+		if ( allowed === false ) {
+			return false;
+		}
+		this._mouseSliding = true;
+
+		this._handleIndex = index;
+
+		closestHandle
+			.addClass( "ui-state-active" )
+			.focus();
+
+		offset = closestHandle.offset();
+		mouseOverHandle = !$( event.target ).parents().addBack().is( ".ui-slider-handle" );
+		this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
+			left: event.pageX - offset.left - ( closestHandle.width() / 2 ),
+			top: event.pageY - offset.top -
+				( closestHandle.height() / 2 ) -
+				( parseInt( closestHandle.css("borderTopWidth"), 10 ) || 0 ) -
+				( parseInt( closestHandle.css("borderBottomWidth"), 10 ) || 0) +
+				( parseInt( closestHandle.css("marginTop"), 10 ) || 0)
+		};
+
+		if ( !this.handles.hasClass( "ui-state-hover" ) ) {
+			this._slide( event, index, normValue );
+		}
+		this._animateOff = true;
+		return true;
+	},
+
+	_mouseStart: function() {
+		return true;
+	},
+
+	_mouseDrag: function( event ) {
+		var position = { x: event.pageX, y: event.pageY },
+			normValue = this._normValueFromMouse( position );
+
+		this._slide( event, this._handleIndex, normValue );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		this.handles.removeClass( "ui-state-active" );
+		this._mouseSliding = false;
+
+		this._stop( event, this._handleIndex );
+		this._change( event, this._handleIndex );
+
+		this._handleIndex = null;
+		this._clickOffset = null;
+		this._animateOff = false;
+
+		return false;
+	},
+
+	_detectOrientation: function() {
+		this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
+	},
+
+	_normValueFromMouse: function( position ) {
+		var pixelTotal,
+			pixelMouse,
+			percentMouse,
+			valueTotal,
+			valueMouse;
+
+		if ( this.orientation === "horizontal" ) {
+			pixelTotal = this.elementSize.width;
+			pixelMouse = position.x - this.elementOffset.left - ( this._clickOffset ? this._clickOffset.left : 0 );
+		} else {
+			pixelTotal = this.elementSize.height;
+			pixelMouse = position.y - this.elementOffset.top - ( this._clickOffset ? this._clickOffset.top : 0 );
+		}
+
+		percentMouse = ( pixelMouse / pixelTotal );
+		if ( percentMouse > 1 ) {
+			percentMouse = 1;
+		}
+		if ( percentMouse < 0 ) {
+			percentMouse = 0;
+		}
+		if ( this.orientation === "vertical" ) {
+			percentMouse = 1 - percentMouse;
+		}
+
+		valueTotal = this._valueMax() - this._valueMin();
+		valueMouse = this._valueMin() + percentMouse * valueTotal;
+
+		return this._trimAlignValue( valueMouse );
+	},
+
+	_start: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+		return this._trigger( "start", event, uiHash );
+	},
+
+	_slide: function( event, index, newVal ) {
+		var otherVal,
+			newValues,
+			allowed;
+
+		if ( this.options.values && this.options.values.length ) {
+			otherVal = this.values( index ? 0 : 1 );
+
+			if ( ( this.options.values.length === 2 && this.options.range === true ) &&
+					( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
+				) {
+				newVal = otherVal;
+			}
+
+			if ( newVal !== this.values( index ) ) {
+				newValues = this.values();
+				newValues[ index ] = newVal;
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal,
+					values: newValues
+				} );
+				otherVal = this.values( index ? 0 : 1 );
+				if ( allowed !== false ) {
+					this.values( index, newVal, true );
+				}
+			}
+		} else {
+			if ( newVal !== this.value() ) {
+				// A slide can be canceled by returning false from the slide callback
+				allowed = this._trigger( "slide", event, {
+					handle: this.handles[ index ],
+					value: newVal
+				} );
+				if ( allowed !== false ) {
+					this.value( newVal );
+				}
+			}
+		}
+	},
+
+	_stop: function( event, index ) {
+		var uiHash = {
+			handle: this.handles[ index ],
+			value: this.value()
+		};
+		if ( this.options.values && this.options.values.length ) {
+			uiHash.value = this.values( index );
+			uiHash.values = this.values();
+		}
+
+		this._trigger( "stop", event, uiHash );
+	},
+
+	_change: function( event, index ) {
+		if ( !this._keySliding && !this._mouseSliding ) {
+			var uiHash = {
+				handle: this.handles[ index ],
+				value: this.value()
+			};
+			if ( this.options.values && this.options.values.length ) {
+				uiHash.value = this.values( index );
+				uiHash.values = this.values();
+			}
+
+			//store the last changed value index for reference when handles overlap
+			this._lastChangedValue = index;
+
+			this._trigger( "change", event, uiHash );
+		}
+	},
+
+	value: function( newValue ) {
+		if ( arguments.length ) {
+			this.options.value = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, 0 );
+			return;
+		}
+
+		return this._value();
+	},
+
+	values: function( index, newValue ) {
+		var vals,
+			newValues,
+			i;
+
+		if ( arguments.length > 1 ) {
+			this.options.values[ index ] = this._trimAlignValue( newValue );
+			this._refreshValue();
+			this._change( null, index );
+			return;
+		}
+
+		if ( arguments.length ) {
+			if ( $.isArray( arguments[ 0 ] ) ) {
+				vals = this.options.values;
+				newValues = arguments[ 0 ];
+				for ( i = 0; i < vals.length; i += 1 ) {
+					vals[ i ] = this._trimAlignValue( newValues[ i ] );
+					this._change( null, i );
+				}
+				this._refreshValue();
+			} else {
+				if ( this.options.values && this.options.values.length ) {
+					return this._values( index );
+				} else {
+					return this.value();
+				}
+			}
+		} else {
+			return this._values();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var i,
+			valsLength = 0;
+
+		if ( $.isArray( this.options.values ) ) {
+			valsLength = this.options.values.length;
+		}
+
+		$.Widget.prototype._setOption.apply( this, arguments );
+
+		switch ( key ) {
+			case "disabled":
+				if ( value ) {
+					this.handles.filter( ".ui-state-focus" ).blur();
+					this.handles.removeClass( "ui-state-hover" );
+					this.handles.prop( "disabled", true );
+				} else {
+					this.handles.prop( "disabled", false );
+				}
+				break;
+			case "orientation":
+				this._detectOrientation();
+				this.element
+					.removeClass( "ui-slider-horizontal ui-slider-vertical" )
+					.addClass( "ui-slider-" + this.orientation );
+				this._refreshValue();
+				break;
+			case "value":
+				this._animateOff = true;
+				this._refreshValue();
+				this._change( null, 0 );
+				this._animateOff = false;
+				break;
+			case "values":
+				this._animateOff = true;
+				this._refreshValue();
+				for ( i = 0; i < valsLength; i += 1 ) {
+					this._change( null, i );
+				}
+				this._animateOff = false;
+				break;
+			case "min":
+			case "max":
+				this._animateOff = true;
+				this._refreshValue();
+				this._animateOff = false;
+				break;
+		}
+	},
+
+	//internal value getter
+	// _value() returns value trimmed by min and max, aligned by step
+	_value: function() {
+		var val = this.options.value;
+		val = this._trimAlignValue( val );
+
+		return val;
+	},
+
+	//internal values getter
+	// _values() returns array of values trimmed by min and max, aligned by step
+	// _values( index ) returns single value trimmed by min and max, aligned by step
+	_values: function( index ) {
+		var val,
+			vals,
+			i;
+
+		if ( arguments.length ) {
+			val = this.options.values[ index ];
+			val = this._trimAlignValue( val );
+
+			return val;
+		} else {
+			// .slice() creates a copy of the array
+			// this copy gets trimmed by min and max and then returned
+			vals = this.options.values.slice();
+			for ( i = 0; i < vals.length; i+= 1) {
+				vals[ i ] = this._trimAlignValue( vals[ i ] );
+			}
+
+			return vals;
+		}
+	},
+
+	// returns the step-aligned value that val is closest to, between (inclusive) min and max
+	_trimAlignValue: function( val ) {
+		if ( val <= this._valueMin() ) {
+			return this._valueMin();
+		}
+		if ( val >= this._valueMax() ) {
+			return this._valueMax();
+		}
+		var step = ( this.options.step > 0 ) ? this.options.step : 1,
+			valModStep = (val - this._valueMin()) % step,
+			alignValue = val - valModStep;
+
+		if ( Math.abs(valModStep) * 2 >= step ) {
+			alignValue += ( valModStep > 0 ) ? step : ( -step );
+		}
+
+		// Since JavaScript has problems with large floats, round
+		// the final value to 5 digits after the decimal point (see #4124)
+		return parseFloat( alignValue.toFixed(5) );
+	},
+
+	_valueMin: function() {
+		return this.options.min;
+	},
+
+	_valueMax: function() {
+		return this.options.max;
+	},
+
+	_refreshValue: function() {
+		var lastValPercent, valPercent, value, valueMin, valueMax,
+			oRange = this.options.range,
+			o = this.options,
+			that = this,
+			animate = ( !this._animateOff ) ? o.animate : false,
+			_set = {};
+
+		if ( this.options.values && this.options.values.length ) {
+			this.handles.each(function( i ) {
+				valPercent = ( that.values(i) - that._valueMin() ) / ( that._valueMax() - that._valueMin() ) * 100;
+				_set[ that.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+				$( this ).stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+				if ( that.options.range === true ) {
+					if ( that.orientation === "horizontal" ) {
+						if ( i === 0 ) {
+							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { left: valPercent + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							that.range[ animate ? "animate" : "css" ]( { width: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					} else {
+						if ( i === 0 ) {
+							that.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { bottom: ( valPercent ) + "%" }, o.animate );
+						}
+						if ( i === 1 ) {
+							that.range[ animate ? "animate" : "css" ]( { height: ( valPercent - lastValPercent ) + "%" }, { queue: false, duration: o.animate } );
+						}
+					}
+				}
+				lastValPercent = valPercent;
+			});
+		} else {
+			value = this.value();
+			valueMin = this._valueMin();
+			valueMax = this._valueMax();
+			valPercent = ( valueMax !== valueMin ) ?
+					( value - valueMin ) / ( valueMax - valueMin ) * 100 :
+					0;
+			_set[ this.orientation === "horizontal" ? "left" : "bottom" ] = valPercent + "%";
+			this.handle.stop( 1, 1 )[ animate ? "animate" : "css" ]( _set, o.animate );
+
+			if ( oRange === "min" && this.orientation === "horizontal" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { width: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "horizontal" ) {
+				this.range[ animate ? "animate" : "css" ]( { width: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+			if ( oRange === "min" && this.orientation === "vertical" ) {
+				this.range.stop( 1, 1 )[ animate ? "animate" : "css" ]( { height: valPercent + "%" }, o.animate );
+			}
+			if ( oRange === "max" && this.orientation === "vertical" ) {
+				this.range[ animate ? "animate" : "css" ]( { height: ( 100 - valPercent ) + "%" }, { queue: false, duration: o.animate } );
+			}
+		}
+	},
+
+	_handleEvents: {
+		keydown: function( event ) {
+			/*jshint maxcomplexity:25*/
+			var allowed, curVal, newVal, step,
+				index = $( event.target ).data( "ui-slider-handle-index" );
+
+			switch ( event.keyCode ) {
+				case $.ui.keyCode.HOME:
+				case $.ui.keyCode.END:
+				case $.ui.keyCode.PAGE_UP:
+				case $.ui.keyCode.PAGE_DOWN:
+				case $.ui.keyCode.UP:
+				case $.ui.keyCode.RIGHT:
+				case $.ui.keyCode.DOWN:
+				case $.ui.keyCode.LEFT:
+					event.preventDefault();
+					if ( !this._keySliding ) {
+						this._keySliding = true;
+						$( event.target ).addClass( "ui-state-active" );
+						allowed = this._start( event, index );
+						if ( allowed === false ) {
+							return;
+						}
+					}
+					break;
+			}
+
+			step = this.options.step;
+			if ( this.options.values && this.options.values.length ) {
+				curVal = newVal = this.values( index );
+			} else {
+				curVal = newVal = this.value();
+			}
+
+			switch ( event.keyCode ) {
+				case $.ui.keyCode.HOME:
+					newVal = this._valueMin();
+					break;
+				case $.ui.keyCode.END:
+					newVal = this._valueMax();
+					break;
+				case $.ui.keyCode.PAGE_UP:
+					newVal = this._trimAlignValue( curVal + ( (this._valueMax() - this._valueMin()) / numPages ) );
+					break;
+				case $.ui.keyCode.PAGE_DOWN:
+					newVal = this._trimAlignValue( curVal - ( (this._valueMax() - this._valueMin()) / numPages ) );
+					break;
+				case $.ui.keyCode.UP:
+				case $.ui.keyCode.RIGHT:
+					if ( curVal === this._valueMax() ) {
+						return;
+					}
+					newVal = this._trimAlignValue( curVal + step );
+					break;
+				case $.ui.keyCode.DOWN:
+				case $.ui.keyCode.LEFT:
+					if ( curVal === this._valueMin() ) {
+						return;
+					}
+					newVal = this._trimAlignValue( curVal - step );
+					break;
+			}
+
+			this._slide( event, index, newVal );
+		},
+		keyup: function( event ) {
+			var index = $( event.target ).data( "ui-slider-handle-index" );
+
+			if ( this._keySliding ) {
+				this._keySliding = false;
+				this._stop( event, index );
+				this._change( event, index );
+				$( event.target ).removeClass( "ui-state-active" );
+			}
+		}
+	}
+
+});
+
+}(jQuery));
+(function( $ ) {
+
+function modifier( fn ) {
+	return function() {
+		var previous = this.element.val();
+		fn.apply( this, arguments );
+		this._refresh();
+		if ( previous !== this.element.val() ) {
+			this._trigger( "change" );
+		}
+	};
+}
+
+$.widget( "ui.spinner", {
+	version: "1.10.0",
+	defaultElement: "<input>",
+	widgetEventPrefix: "spin",
+	options: {
+		culture: null,
+		icons: {
+			down: "ui-icon-triangle-1-s",
+			up: "ui-icon-triangle-1-n"
+		},
+		incremental: true,
+		max: null,
+		min: null,
+		numberFormat: null,
+		page: 10,
+		step: 1,
+
+		change: null,
+		spin: null,
+		start: null,
+		stop: null
+	},
+
+	_create: function() {
+		// handle string values that need to be parsed
+		this._setOption( "max", this.options.max );
+		this._setOption( "min", this.options.min );
+		this._setOption( "step", this.options.step );
+
+		// format the value, but don't constrain
+		this._value( this.element.val(), true );
+
+		this._draw();
+		this._on( this._events );
+		this._refresh();
+
+		// turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		this._on( this.window, {
+			beforeunload: function() {
+				this.element.removeAttr( "autocomplete" );
+			}
+		});
+	},
+
+	_getCreateOptions: function() {
+		var options = {},
+			element = this.element;
+
+		$.each( [ "min", "max", "step" ], function( i, option ) {
+			var value = element.attr( option );
+			if ( value !== undefined && value.length ) {
+				options[ option ] = value;
+			}
+		});
+
+		return options;
+	},
+
+	_events: {
+		keydown: function( event ) {
+			if ( this._start( event ) && this._keydown( event ) ) {
+				event.preventDefault();
+			}
+		},
+		keyup: "_stop",
+		focus: function() {
+			this.previous = this.element.val();
+		},
+		blur: function( event ) {
+			if ( this.cancelBlur ) {
+				delete this.cancelBlur;
+				return;
+			}
+
+			this._refresh();
+			if ( this.previous !== this.element.val() ) {
+				this._trigger( "change", event );
+			}
+		},
+		mousewheel: function( event, delta ) {
+			if ( !delta ) {
+				return;
+			}
+			if ( !this.spinning && !this._start( event ) ) {
+				return false;
+			}
+
+			this._spin( (delta > 0 ? 1 : -1) * this.options.step, event );
+			clearTimeout( this.mousewheelTimer );
+			this.mousewheelTimer = this._delay(function() {
+				if ( this.spinning ) {
+					this._stop( event );
+				}
+			}, 100 );
+			event.preventDefault();
+		},
+		"mousedown .ui-spinner-button": function( event ) {
+			var previous;
+
+			// We never want the buttons to have focus; whenever the user is
+			// interacting with the spinner, the focus should be on the input.
+			// If the input is focused then this.previous is properly set from
+			// when the input first received focus. If the input is not focused
+			// then we need to set this.previous based on the value before spinning.
+			previous = this.element[0] === this.document[0].activeElement ?
+				this.previous : this.element.val();
+			function checkFocus() {
+				var isActive = this.element[0] === this.document[0].activeElement;
+				if ( !isActive ) {
+					this.element.focus();
+					this.previous = previous;
+					// support: IE
+					// IE sets focus asynchronously, so we need to check if focus
+					// moved off of the input because the user clicked on the button.
+					this._delay(function() {
+						this.previous = previous;
+					});
+				}
+			}
+
+			// ensure focus is on (or stays on) the text field
+			event.preventDefault();
+			checkFocus.call( this );
+
+			// support: IE
+			// IE doesn't prevent moving focus even with event.preventDefault()
+			// so we set a flag to know when we should ignore the blur event
+			// and check (again) if focus moved off of the input.
+			this.cancelBlur = true;
+			this._delay(function() {
+				delete this.cancelBlur;
+				checkFocus.call( this );
+			});
+
+			if ( this._start( event ) === false ) {
+				return;
+			}
+
+			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
+		},
+		"mouseup .ui-spinner-button": "_stop",
+		"mouseenter .ui-spinner-button": function( event ) {
+			// button will add ui-state-active if mouse was down while mouseleave and kept down
+			if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) {
+				return;
+			}
+
+			if ( this._start( event ) === false ) {
+				return false;
+			}
+			this._repeat( null, $( event.currentTarget ).hasClass( "ui-spinner-up" ) ? 1 : -1, event );
+		},
+		// TODO: do we really want to consider this a stop?
+		// shouldn't we just stop the repeater and wait until mouseup before
+		// we trigger the stop event?
+		"mouseleave .ui-spinner-button": "_stop"
+	},
+
+	_draw: function() {
+		var uiSpinner = this.uiSpinner = this.element
+			.addClass( "ui-spinner-input" )
+			.attr( "autocomplete", "off" )
+			.wrap( this._uiSpinnerHtml() )
+			.parent()
+				// add buttons
+				.append( this._buttonHtml() );
+
+		this.element.attr( "role", "spinbutton" );
+
+		// button bindings
+		this.buttons = uiSpinner.find( ".ui-spinner-button" )
+			.attr( "tabIndex", -1 )
+			.button()
+			.removeClass( "ui-corner-all" );
+
+		// IE 6 doesn't understand height: 50% for the buttons
+		// unless the wrapper has an explicit height
+		if ( this.buttons.height() > Math.ceil( uiSpinner.height() * 0.5 ) &&
+				uiSpinner.height() > 0 ) {
+			uiSpinner.height( uiSpinner.height() );
+		}
+
+		// disable spinner if element was already disabled
+		if ( this.options.disabled ) {
+			this.disable();
+		}
+	},
+
+	_keydown: function( event ) {
+		var options = this.options,
+			keyCode = $.ui.keyCode;
+
+		switch ( event.keyCode ) {
+		case keyCode.UP:
+			this._repeat( null, 1, event );
+			return true;
+		case keyCode.DOWN:
+			this._repeat( null, -1, event );
+			return true;
+		case keyCode.PAGE_UP:
+			this._repeat( null, options.page, event );
+			return true;
+		case keyCode.PAGE_DOWN:
+			this._repeat( null, -options.page, event );
+			return true;
+		}
+
+		return false;
+	},
+
+	_uiSpinnerHtml: function() {
+		return "<span class='ui-spinner ui-widget ui-widget-content ui-corner-all'></span>";
+	},
+
+	_buttonHtml: function() {
+		return "" +
+			"<a class='ui-spinner-button ui-spinner-up ui-corner-tr'>" +
+				"<span class='ui-icon " + this.options.icons.up + "'>&#9650;</span>" +
+			"</a>" +
+			"<a class='ui-spinner-button ui-spinner-down ui-corner-br'>" +
+				"<span class='ui-icon " + this.options.icons.down + "'>&#9660;</span>" +
+			"</a>";
+	},
+
+	_start: function( event ) {
+		if ( !this.spinning && this._trigger( "start", event ) === false ) {
+			return false;
+		}
+
+		if ( !this.counter ) {
+			this.counter = 1;
+		}
+		this.spinning = true;
+		return true;
+	},
+
+	_repeat: function( i, steps, event ) {
+		i = i || 500;
+
+		clearTimeout( this.timer );
+		this.timer = this._delay(function() {
+			this._repeat( 40, steps, event );
+		}, i );
+
+		this._spin( steps * this.options.step, event );
+	},
+
+	_spin: function( step, event ) {
+		var value = this.value() || 0;
+
+		if ( !this.counter ) {
+			this.counter = 1;
+		}
+
+		value = this._adjustValue( value + step * this._increment( this.counter ) );
+
+		if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false) {
+			this._value( value );
+			this.counter++;
+		}
+	},
+
+	_increment: function( i ) {
+		var incremental = this.options.incremental;
+
+		if ( incremental ) {
+			return $.isFunction( incremental ) ?
+				incremental( i ) :
+				Math.floor( i*i*i/50000 - i*i/500 + 17*i/200 + 1 );
+		}
+
+		return 1;
+	},
+
+	_precision: function() {
+		var precision = this._precisionOf( this.options.step );
+		if ( this.options.min !== null ) {
+			precision = Math.max( precision, this._precisionOf( this.options.min ) );
+		}
+		return precision;
+	},
+
+	_precisionOf: function( num ) {
+		var str = num.toString(),
+			decimal = str.indexOf( "." );
+		return decimal === -1 ? 0 : str.length - decimal - 1;
+	},
+
+	_adjustValue: function( value ) {
+		var base, aboveMin,
+			options = this.options;
+
+		// make sure we're at a valid step
+		// - find out where we are relative to the base (min or 0)
+		base = options.min !== null ? options.min : 0;
+		aboveMin = value - base;
+		// - round to the nearest step
+		aboveMin = Math.round(aboveMin / options.step) * options.step;
+		// - rounding is based on 0, so adjust back to our base
+		value = base + aboveMin;
+
+		// fix precision from bad JS floating point math
+		value = parseFloat( value.toFixed( this._precision() ) );
+
+		// clamp the value
+		if ( options.max !== null && value > options.max) {
+			return options.max;
+		}
+		if ( options.min !== null && value < options.min ) {
+			return options.min;
+		}
+
+		return value;
+	},
+
+	_stop: function( event ) {
+		if ( !this.spinning ) {
+			return;
+		}
+
+		clearTimeout( this.timer );
+		clearTimeout( this.mousewheelTimer );
+		this.counter = 0;
+		this.spinning = false;
+		this._trigger( "stop", event );
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "culture" || key === "numberFormat" ) {
+			var prevValue = this._parse( this.element.val() );
+			this.options[ key ] = value;
+			this.element.val( this._format( prevValue ) );
+			return;
+		}
+
+		if ( key === "max" || key === "min" || key === "step" ) {
+			if ( typeof value === "string" ) {
+				value = this._parse( value );
+			}
+		}
+		if ( key === "icons" ) {
+			this.buttons.first().find( ".ui-icon" )
+				.removeClass( this.options.icons.up )
+				.addClass( value.up );
+			this.buttons.last().find( ".ui-icon" )
+				.removeClass( this.options.icons.down )
+				.addClass( value.down );
+		}
+
+		this._super( key, value );
+
+		if ( key === "disabled" ) {
+			if ( value ) {
+				this.element.prop( "disabled", true );
+				this.buttons.button( "disable" );
+			} else {
+				this.element.prop( "disabled", false );
+				this.buttons.button( "enable" );
+			}
+		}
+	},
+
+	_setOptions: modifier(function( options ) {
+		this._super( options );
+		this._value( this.element.val() );
+	}),
+
+	_parse: function( val ) {
+		if ( typeof val === "string" && val !== "" ) {
+			val = window.Globalize && this.options.numberFormat ?
+				Globalize.parseFloat( val, 10, this.options.culture ) : +val;
+		}
+		return val === "" || isNaN( val ) ? null : val;
+	},
+
+	_format: function( value ) {
+		if ( value === "" ) {
+			return "";
+		}
+		return window.Globalize && this.options.numberFormat ?
+			Globalize.format( value, this.options.numberFormat, this.options.culture ) :
+			value;
+	},
+
+	_refresh: function() {
+		this.element.attr({
+			"aria-valuemin": this.options.min,
+			"aria-valuemax": this.options.max,
+			// TODO: what should we do with values that can't be parsed?
+			"aria-valuenow": this._parse( this.element.val() )
+		});
+	},
+
+	// update the value without triggering change
+	_value: function( value, allowAny ) {
+		var parsed;
+		if ( value !== "" ) {
+			parsed = this._parse( value );
+			if ( parsed !== null ) {
+				if ( !allowAny ) {
+					parsed = this._adjustValue( parsed );
+				}
+				value = this._format( parsed );
+			}
+		}
+		this.element.val( value );
+		this._refresh();
+	},
+
+	_destroy: function() {
+		this.element
+			.removeClass( "ui-spinner-input" )
+			.prop( "disabled", false )
+			.removeAttr( "autocomplete" )
+			.removeAttr( "role" )
+			.removeAttr( "aria-valuemin" )
+			.removeAttr( "aria-valuemax" )
+			.removeAttr( "aria-valuenow" );
+		this.uiSpinner.replaceWith( this.element );
+	},
+
+	stepUp: modifier(function( steps ) {
+		this._stepUp( steps );
+	}),
+	_stepUp: function( steps ) {
+		if ( this._start() ) {
+			this._spin( (steps || 1) * this.options.step );
+			this._stop();
+		}
+	},
+
+	stepDown: modifier(function( steps ) {
+		this._stepDown( steps );
+	}),
+	_stepDown: function( steps ) {
+		if ( this._start() ) {
+			this._spin( (steps || 1) * -this.options.step );
+			this._stop();
+		}
+	},
+
+	pageUp: modifier(function( pages ) {
+		this._stepUp( (pages || 1) * this.options.page );
+	}),
+
+	pageDown: modifier(function( pages ) {
+		this._stepDown( (pages || 1) * this.options.page );
+	}),
+
+	value: function( newVal ) {
+		if ( !arguments.length ) {
+			return this._parse( this.element.val() );
+		}
+		modifier( this._value ).call( this, newVal );
+	},
+
+	widget: function() {
+		return this.uiSpinner;
+	}
+});
+
+}( jQuery ) );
+(function( $, undefined ) {
+
+var tabId = 0,
+	rhash = /#.*$/;
+
+function getNextTabId() {
+	return ++tabId;
+}
+
+function isLocal( anchor ) {
+	return anchor.hash.length > 1 &&
+		decodeURIComponent( anchor.href.replace( rhash, "" ) ) ===
+			decodeURIComponent( location.href.replace( rhash, "" ) );
+}
+
+$.widget( "ui.tabs", {
+	version: "1.10.0",
+	delay: 300,
+	options: {
+		active: null,
+		collapsible: false,
+		event: "click",
+		heightStyle: "content",
+		hide: null,
+		show: null,
+
+		// callbacks
+		activate: null,
+		beforeActivate: null,
+		beforeLoad: null,
+		load: null
+	},
+
+	_create: function() {
+		var that = this,
+			options = this.options;
+
+		this.running = false;
+
+		this.element
+			.addClass( "ui-tabs ui-widget ui-widget-content ui-corner-all" )
+			.toggleClass( "ui-tabs-collapsible", options.collapsible )
+			// Prevent users from focusing disabled tabs via click
+			.delegate( ".ui-tabs-nav > li", "mousedown" + this.eventNamespace, function( event ) {
+				if ( $( this ).is( ".ui-state-disabled" ) ) {
+					event.preventDefault();
+				}
+			})
+			// support: IE <9
+			// Preventing the default action in mousedown doesn't prevent IE
+			// from focusing the element, so if the anchor gets focused, blur.
+			// We don't have to worry about focusing the previously focused
+			// element since clicking on a non-focusable element should focus
+			// the body anyway.
+			.delegate( ".ui-tabs-anchor", "focus" + this.eventNamespace, function() {
+				if ( $( this ).closest( "li" ).is( ".ui-state-disabled" ) ) {
+					this.blur();
+				}
+			});
+
+		this._processTabs();
+		options.active = this._initialActive();
+
+		// Take disabling tabs via class attribute from HTML
+		// into account and update option properly.
+		if ( $.isArray( options.disabled ) ) {
+			options.disabled = $.unique( options.disabled.concat(
+				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
+					return that.tabs.index( li );
+				})
+			) ).sort();
+		}
+
+		// check for length avoids error when initializing empty list
+		if ( this.options.active !== false && this.anchors.length ) {
+			this.active = this._findActive( options.active );
+		} else {
+			this.active = $();
+		}
+
+		this._refresh();
+
+		if ( this.active.length ) {
+			this.load( options.active );
+		}
+	},
+
+	_initialActive: function() {
+		var active = this.options.active,
+			collapsible = this.options.collapsible,
+			locationHash = location.hash.substring( 1 );
+
+		if ( active === null ) {
+			// check the fragment identifier in the URL
+			if ( locationHash ) {
+				this.tabs.each(function( i, tab ) {
+					if ( $( tab ).attr( "aria-controls" ) === locationHash ) {
+						active = i;
+						return false;
+					}
+				});
+			}
+
+			// check for a tab marked active via a class
+			if ( active === null ) {
+				active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) );
+			}
+
+			// no active tab, set to false
+			if ( active === null || active === -1 ) {
+				active = this.tabs.length ? 0 : false;
+			}
+		}
+
+		// handle numbers: negative, out of range
+		if ( active !== false ) {
+			active = this.tabs.index( this.tabs.eq( active ) );
+			if ( active === -1 ) {
+				active = collapsible ? false : 0;
+			}
+		}
+
+		// don't allow collapsible: false and active: false
+		if ( !collapsible && active === false && this.anchors.length ) {
+			active = 0;
+		}
+
+		return active;
+	},
+
+	_getCreateEventData: function() {
+		return {
+			tab: this.active,
+			panel: !this.active.length ? $() : this._getPanelForTab( this.active )
+		};
+	},
+
+	_tabKeydown: function( event ) {
+		/*jshint maxcomplexity:15*/
+		var focusedTab = $( this.document[0].activeElement ).closest( "li" ),
+			selectedIndex = this.tabs.index( focusedTab ),
+			goingForward = true;
+
+		if ( this._handlePageNav( event ) ) {
+			return;
+		}
+
+		switch ( event.keyCode ) {
+			case $.ui.keyCode.RIGHT:
+			case $.ui.keyCode.DOWN:
+				selectedIndex++;
+				break;
+			case $.ui.keyCode.UP:
+			case $.ui.keyCode.LEFT:
+				goingForward = false;
+				selectedIndex--;
+				break;
+			case $.ui.keyCode.END:
+				selectedIndex = this.anchors.length - 1;
+				break;
+			case $.ui.keyCode.HOME:
+				selectedIndex = 0;
+				break;
+			case $.ui.keyCode.SPACE:
+				// Activate only, no collapsing
+				event.preventDefault();
+				clearTimeout( this.activating );
+				this._activate( selectedIndex );
+				return;
+			case $.ui.keyCode.ENTER:
+				// Toggle (cancel delayed activation, allow collapsing)
+				event.preventDefault();
+				clearTimeout( this.activating );
+				// Determine if we should collapse or activate
+				this._activate( selectedIndex === this.options.active ? false : selectedIndex );
+				return;
+			default:
+				return;
+		}
+
+		// Focus the appropriate tab, based on which key was pressed
+		event.preventDefault();
+		clearTimeout( this.activating );
+		selectedIndex = this._focusNextTab( selectedIndex, goingForward );
+
+		// Navigating with control key will prevent automatic activation
+		if ( !event.ctrlKey ) {
+			// Update aria-selected immediately so that AT think the tab is already selected.
+			// Otherwise AT may confuse the user by stating that they need to activate the tab,
+			// but the tab will already be activated by the time the announcement finishes.
+			focusedTab.attr( "aria-selected", "false" );
+			this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" );
+
+			this.activating = this._delay(function() {
+				this.option( "active", selectedIndex );
+			}, this.delay );
+		}
+	},
+
+	_panelKeydown: function( event ) {
+		if ( this._handlePageNav( event ) ) {
+			return;
+		}
+
+		// Ctrl+up moves focus to the current tab
+		if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) {
+			event.preventDefault();
+			this.active.focus();
+		}
+	},
+
+	// Alt+page up/down moves focus to the previous/next tab (and activates)
+	_handlePageNav: function( event ) {
+		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) {
+			this._activate( this._focusNextTab( this.options.active - 1, false ) );
+			return true;
+		}
+		if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) {
+			this._activate( this._focusNextTab( this.options.active + 1, true ) );
+			return true;
+		}
+	},
+
+	_findNextTab: function( index, goingForward ) {
+		var lastTabIndex = this.tabs.length - 1;
+
+		function constrain() {
+			if ( index > lastTabIndex ) {
+				index = 0;
+			}
+			if ( index < 0 ) {
+				index = lastTabIndex;
+			}
+			return index;
+		}
+
+		while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) {
+			index = goingForward ? index + 1 : index - 1;
+		}
+
+		return index;
+	},
+
+	_focusNextTab: function( index, goingForward ) {
+		index = this._findNextTab( index, goingForward );
+		this.tabs.eq( index ).focus();
+		return index;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "active" ) {
+			// _activate() will handle invalid values and update this.options
+			this._activate( value );
+			return;
+		}
+
+		if ( key === "disabled" ) {
+			// don't use the widget factory's disabled handling
+			this._setupDisabled( value );
+			return;
+		}
+
+		this._super( key, value);
+
+		if ( key === "collapsible" ) {
+			this.element.toggleClass( "ui-tabs-collapsible", value );
+			// Setting collapsible: false while collapsed; open first panel
+			if ( !value && this.options.active === false ) {
+				this._activate( 0 );
+			}
+		}
+
+		if ( key === "event" ) {
+			this._setupEvents( value );
+		}
+
+		if ( key === "heightStyle" ) {
+			this._setupHeightStyle( value );
+		}
+	},
+
+	_tabId: function( tab ) {
+		return tab.attr( "aria-controls" ) || "ui-tabs-" + getNextTabId();
+	},
+
+	_sanitizeSelector: function( hash ) {
+		return hash ? hash.replace( /[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g, "\\$&" ) : "";
+	},
+
+	refresh: function() {
+		var options = this.options,
+			lis = this.tablist.children( ":has(a[href])" );
+
+		// get disabled tabs from class attribute from HTML
+		// this will get converted to a boolean if needed in _refresh()
+		options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) {
+			return lis.index( tab );
+		});
+
+		this._processTabs();
+
+		// was collapsed or no tabs
+		if ( options.active === false || !this.anchors.length ) {
+			options.active = false;
+			this.active = $();
+		// was active, but active tab is gone
+		} else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) {
+			// all remaining tabs are disabled
+			if ( this.tabs.length === options.disabled.length ) {
+				options.active = false;
+				this.active = $();
+			// activate previous tab
+			} else {
+				this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) );
+			}
+		// was active, active tab still exists
+		} else {
+			// make sure active index is correct
+			options.active = this.tabs.index( this.active );
+		}
+
+		this._refresh();
+	},
+
+	_refresh: function() {
+		this._setupDisabled( this.options.disabled );
+		this._setupEvents( this.options.event );
+		this._setupHeightStyle( this.options.heightStyle );
+
+		this.tabs.not( this.active ).attr({
+			"aria-selected": "false",
+			tabIndex: -1
+		});
+		this.panels.not( this._getPanelForTab( this.active ) )
+			.hide()
+			.attr({
+				"aria-expanded": "false",
+				"aria-hidden": "true"
+			});
+
+		// Make sure one tab is in the tab order
+		if ( !this.active.length ) {
+			this.tabs.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			this.active
+				.addClass( "ui-tabs-active ui-state-active" )
+				.attr({
+					"aria-selected": "true",
+					tabIndex: 0
+				});
+			this._getPanelForTab( this.active )
+				.show()
+				.attr({
+					"aria-expanded": "true",
+					"aria-hidden": "false"
+				});
+		}
+	},
+
+	_processTabs: function() {
+		var that = this;
+
+		this.tablist = this._getList()
+			.addClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
+			.attr( "role", "tablist" );
+
+		this.tabs = this.tablist.find( "> li:has(a[href])" )
+			.addClass( "ui-state-default ui-corner-top" )
+			.attr({
+				role: "tab",
+				tabIndex: -1
+			});
+
+		this.anchors = this.tabs.map(function() {
+				return $( "a", this )[ 0 ];
+			})
+			.addClass( "ui-tabs-anchor" )
+			.attr({
+				role: "presentation",
+				tabIndex: -1
+			});
+
+		this.panels = $();
+
+		this.anchors.each(function( i, anchor ) {
+			var selector, panel, panelId,
+				anchorId = $( anchor ).uniqueId().attr( "id" ),
+				tab = $( anchor ).closest( "li" ),
+				originalAriaControls = tab.attr( "aria-controls" );
+
+			// inline tab
+			if ( isLocal( anchor ) ) {
+				selector = anchor.hash;
+				panel = that.element.find( that._sanitizeSelector( selector ) );
+			// remote tab
+			} else {
+				panelId = that._tabId( tab );
+				selector = "#" + panelId;
+				panel = that.element.find( selector );
+				if ( !panel.length ) {
+					panel = that._createPanel( panelId );
+					panel.insertAfter( that.panels[ i - 1 ] || that.tablist );
+				}
+				panel.attr( "aria-live", "polite" );
+			}
+
+			if ( panel.length) {
+				that.panels = that.panels.add( panel );
+			}
+			if ( originalAriaControls ) {
+				tab.data( "ui-tabs-aria-controls", originalAriaControls );
+			}
+			tab.attr({
+				"aria-controls": selector.substring( 1 ),
+				"aria-labelledby": anchorId
+			});
+			panel.attr( "aria-labelledby", anchorId );
+		});
+
+		this.panels
+			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+			.attr( "role", "tabpanel" );
+	},
+
+	// allow overriding how to find the list for rare usage scenarios (#7715)
+	_getList: function() {
+		return this.element.find( "ol,ul" ).eq( 0 );
+	},
+
+	_createPanel: function( id ) {
+		return $( "<div>" )
+			.attr( "id", id )
+			.addClass( "ui-tabs-panel ui-widget-content ui-corner-bottom" )
+			.data( "ui-tabs-destroy", true );
+	},
+
+	_setupDisabled: function( disabled ) {
+		if ( $.isArray( disabled ) ) {
+			if ( !disabled.length ) {
+				disabled = false;
+			} else if ( disabled.length === this.anchors.length ) {
+				disabled = true;
+			}
+		}
+
+		// disable tabs
+		for ( var i = 0, li; ( li = this.tabs[ i ] ); i++ ) {
+			if ( disabled === true || $.inArray( i, disabled ) !== -1 ) {
+				$( li )
+					.addClass( "ui-state-disabled" )
+					.attr( "aria-disabled", "true" );
+			} else {
+				$( li )
+					.removeClass( "ui-state-disabled" )
+					.removeAttr( "aria-disabled" );
+			}
+		}
+
+		this.options.disabled = disabled;
+	},
+
+	_setupEvents: function( event ) {
+		var events = {
+			click: function( event ) {
+				event.preventDefault();
+			}
+		};
+		if ( event ) {
+			$.each( event.split(" "), function( index, eventName ) {
+				events[ eventName ] = "_eventHandler";
+			});
+		}
+
+		this._off( this.anchors.add( this.tabs ).add( this.panels ) );
+		this._on( this.anchors, events );
+		this._on( this.tabs, { keydown: "_tabKeydown" } );
+		this._on( this.panels, { keydown: "_panelKeydown" } );
+
+		this._focusable( this.tabs );
+		this._hoverable( this.tabs );
+	},
+
+	_setupHeightStyle: function( heightStyle ) {
+		var maxHeight,
+			parent = this.element.parent();
+
+		if ( heightStyle === "fill" ) {
+			maxHeight = parent.height();
+			maxHeight -= this.element.outerHeight() - this.element.height();
+
+			this.element.siblings( ":visible" ).each(function() {
+				var elem = $( this ),
+					position = elem.css( "position" );
+
+				if ( position === "absolute" || position === "fixed" ) {
+					return;
+				}
+				maxHeight -= elem.outerHeight( true );
+			});
+
+			this.element.children().not( this.panels ).each(function() {
+				maxHeight -= $( this ).outerHeight( true );
+			});
+
+			this.panels.each(function() {
+				$( this ).height( Math.max( 0, maxHeight -
+					$( this ).innerHeight() + $( this ).height() ) );
+			})
+			.css( "overflow", "auto" );
+		} else if ( heightStyle === "auto" ) {
+			maxHeight = 0;
+			this.panels.each(function() {
+				maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() );
+			}).height( maxHeight );
+		}
+	},
+
+	_eventHandler: function( event ) {
+		var options = this.options,
+			active = this.active,
+			anchor = $( event.currentTarget ),
+			tab = anchor.closest( "li" ),
+			clickedIsActive = tab[ 0 ] === active[ 0 ],
+			collapsing = clickedIsActive && options.collapsible,
+			toShow = collapsing ? $() : this._getPanelForTab( tab ),
+			toHide = !active.length ? $() : this._getPanelForTab( active ),
+			eventData = {
+				oldTab: active,
+				oldPanel: toHide,
+				newTab: collapsing ? $() : tab,
+				newPanel: toShow
+			};
+
+		event.preventDefault();
+
+		if ( tab.hasClass( "ui-state-disabled" ) ||
+				// tab is already loading
+				tab.hasClass( "ui-tabs-loading" ) ||
+				// can't switch durning an animation
+				this.running ||
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+			return;
+		}
+
+		options.active = collapsing ? false : this.tabs.index( tab );
+
+		this.active = clickedIsActive ? $() : tab;
+		if ( this.xhr ) {
+			this.xhr.abort();
+		}
+
+		if ( !toHide.length && !toShow.length ) {
+			$.error( "jQuery UI Tabs: Mismatching fragment identifier." );
+		}
+
+		if ( toShow.length ) {
+			this.load( this.tabs.index( tab ), event );
+		}
+		this._toggle( event, eventData );
+	},
+
+	// handles show/hide for selecting tabs
+	_toggle: function( event, eventData ) {
+		var that = this,
+			toShow = eventData.newPanel,
+			toHide = eventData.oldPanel;
+
+		this.running = true;
+
+		function complete() {
+			that.running = false;
+			that._trigger( "activate", event, eventData );
+		}
+
+		function show() {
+			eventData.newTab.closest( "li" ).addClass( "ui-tabs-active ui-state-active" );
+
+			if ( toShow.length && that.options.show ) {
+				that._show( toShow, that.options.show, complete );
+			} else {
+				toShow.show();
+				complete();
+			}
+		}
+
+		// start out by hiding, then showing, then completing
+		if ( toHide.length && this.options.hide ) {
+			this._hide( toHide, this.options.hide, function() {
+				eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
+				show();
+			});
+		} else {
+			eventData.oldTab.closest( "li" ).removeClass( "ui-tabs-active ui-state-active" );
+			toHide.hide();
+			show();
+		}
+
+		toHide.attr({
+			"aria-expanded": "false",
+			"aria-hidden": "true"
+		});
+		eventData.oldTab.attr( "aria-selected", "false" );
+		// If we're switching tabs, remove the old tab from the tab order.
+		// If we're opening from collapsed state, remove the previous tab from the tab order.
+		// If we're collapsing, then keep the collapsing tab in the tab order.
+		if ( toShow.length && toHide.length ) {
+			eventData.oldTab.attr( "tabIndex", -1 );
+		} else if ( toShow.length ) {
+			this.tabs.filter(function() {
+				return $( this ).attr( "tabIndex" ) === 0;
+			})
+			.attr( "tabIndex", -1 );
+		}
+
+		toShow.attr({
+			"aria-expanded": "true",
+			"aria-hidden": "false"
+		});
+		eventData.newTab.attr({
+			"aria-selected": "true",
+			tabIndex: 0
+		});
+	},
+
+	_activate: function( index ) {
+		var anchor,
+			active = this._findActive( index );
+
+		// trying to activate the already active panel
+		if ( active[ 0 ] === this.active[ 0 ] ) {
+			return;
+		}
+
+		// trying to collapse, simulate a click on the current active header
+		if ( !active.length ) {
+			active = this.active;
+		}
+
+		anchor = active.find( ".ui-tabs-anchor" )[ 0 ];
+		this._eventHandler({
+			target: anchor,
+			currentTarget: anchor,
+			preventDefault: $.noop
+		});
+	},
+
+	_findActive: function( index ) {
+		return index === false ? $() : this.tabs.eq( index );
+	},
+
+	_getIndex: function( index ) {
+		// meta-function to give users option to provide a href string instead of a numerical index.
+		if ( typeof index === "string" ) {
+			index = this.anchors.index( this.anchors.filter( "[href$='" + index + "']" ) );
+		}
+
+		return index;
+	},
+
+	_destroy: function() {
+		if ( this.xhr ) {
+			this.xhr.abort();
+		}
+
+		this.element.removeClass( "ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible" );
+
+		this.tablist
+			.removeClass( "ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" )
+			.removeAttr( "role" );
+
+		this.anchors
+			.removeClass( "ui-tabs-anchor" )
+			.removeAttr( "role" )
+			.removeAttr( "tabIndex" )
+			.removeUniqueId();
+
+		this.tabs.add( this.panels ).each(function() {
+			if ( $.data( this, "ui-tabs-destroy" ) ) {
+				$( this ).remove();
+			} else {
+				$( this )
+					.removeClass( "ui-state-default ui-state-active ui-state-disabled " +
+						"ui-corner-top ui-corner-bottom ui-widget-content ui-tabs-active ui-tabs-panel" )
+					.removeAttr( "tabIndex" )
+					.removeAttr( "aria-live" )
+					.removeAttr( "aria-busy" )
+					.removeAttr( "aria-selected" )
+					.removeAttr( "aria-labelledby" )
+					.removeAttr( "aria-hidden" )
+					.removeAttr( "aria-expanded" )
+					.removeAttr( "role" );
+			}
+		});
+
+		this.tabs.each(function() {
+			var li = $( this ),
+				prev = li.data( "ui-tabs-aria-controls" );
+			if ( prev ) {
+				li
+					.attr( "aria-controls", prev )
+					.removeData( "ui-tabs-aria-controls" );
+			} else {
+				li.removeAttr( "aria-controls" );
+			}
+		});
+
+		this.panels.show();
+
+		if ( this.options.heightStyle !== "content" ) {
+			this.panels.css( "height", "" );
+		}
+	},
+
+	enable: function( index ) {
+		var disabled = this.options.disabled;
+		if ( disabled === false ) {
+			return;
+		}
+
+		if ( index === undefined ) {
+			disabled = false;
+		} else {
+			index = this._getIndex( index );
+			if ( $.isArray( disabled ) ) {
+				disabled = $.map( disabled, function( num ) {
+					return num !== index ? num : null;
+				});
+			} else {
+				disabled = $.map( this.tabs, function( li, num ) {
+					return num !== index ? num : null;
+				});
+			}
+		}
+		this._setupDisabled( disabled );
+	},
+
+	disable: function( index ) {
+		var disabled = this.options.disabled;
+		if ( disabled === true ) {
+			return;
+		}
+
+		if ( index === undefined ) {
+			disabled = true;
+		} else {
+			index = this._getIndex( index );
+			if ( $.inArray( index, disabled ) !== -1 ) {
+				return;
+			}
+			if ( $.isArray( disabled ) ) {
+				disabled = $.merge( [ index ], disabled ).sort();
+			} else {
+				disabled = [ index ];
+			}
+		}
+		this._setupDisabled( disabled );
+	},
+
+	load: function( index, event ) {
+		index = this._getIndex( index );
+		var that = this,
+			tab = this.tabs.eq( index ),
+			anchor = tab.find( ".ui-tabs-anchor" ),
+			panel = this._getPanelForTab( tab ),
+			eventData = {
+				tab: tab,
+				panel: panel
+			};
+
+		// not remote
+		if ( isLocal( anchor[ 0 ] ) ) {
+			return;
+		}
+
+		this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) );
+
+		// support: jQuery <1.8
+		// jQuery <1.8 returns false if the request is canceled in beforeSend,
+		// but as of 1.8, $.ajax() always returns a jqXHR object.
+		if ( this.xhr && this.xhr.statusText !== "canceled" ) {
+			tab.addClass( "ui-tabs-loading" );
+			panel.attr( "aria-busy", "true" );
+
+			this.xhr
+				.success(function( response ) {
+					// support: jQuery <1.8
+					// http://bugs.jquery.com/ticket/11778
+					setTimeout(function() {
+						panel.html( response );
+						that._trigger( "load", event, eventData );
+					}, 1 );
+				})
+				.complete(function( jqXHR, status ) {
+					// support: jQuery <1.8
+					// http://bugs.jquery.com/ticket/11778
+					setTimeout(function() {
+						if ( status === "abort" ) {
+							that.panels.stop( false, true );
+						}
+
+						tab.removeClass( "ui-tabs-loading" );
+						panel.removeAttr( "aria-busy" );
+
+						if ( jqXHR === that.xhr ) {
+							delete that.xhr;
+						}
+					}, 1 );
+				});
+		}
+	},
+
+	_ajaxSettings: function( anchor, event, eventData ) {
+		var that = this;
+		return {
+			url: anchor.attr( "href" ),
+			beforeSend: function( jqXHR, settings ) {
+				return that._trigger( "beforeLoad", event,
+					$.extend( { jqXHR : jqXHR, ajaxSettings: settings }, eventData ) );
+			}
+		};
+	},
+
+	_getPanelForTab: function( tab ) {
+		var id = $( tab ).attr( "aria-controls" );
+		return this.element.find( this._sanitizeSelector( "#" + id ) );
+	}
+});
+
+})( jQuery );
+(function( $ ) {
+
+var increments = 0;
+
+function addDescribedBy( elem, id ) {
+	var describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ );
+	describedby.push( id );
+	elem
+		.data( "ui-tooltip-id", id )
+		.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
+}
+
+function removeDescribedBy( elem ) {
+	var id = elem.data( "ui-tooltip-id" ),
+		describedby = (elem.attr( "aria-describedby" ) || "").split( /\s+/ ),
+		index = $.inArray( id, describedby );
+	if ( index !== -1 ) {
+		describedby.splice( index, 1 );
+	}
+
+	elem.removeData( "ui-tooltip-id" );
+	describedby = $.trim( describedby.join( " " ) );
+	if ( describedby ) {
+		elem.attr( "aria-describedby", describedby );
+	} else {
+		elem.removeAttr( "aria-describedby" );
+	}
+}
+
+$.widget( "ui.tooltip", {
+	version: "1.10.0",
+	options: {
+		content: function() {
+			// support: IE<9, Opera in jQuery <1.7
+			// .text() can't accept undefined, so coerce to a string
+			var title = $( this ).attr( "title" ) || "";
+			// Escape title, since we're going from an attribute to raw HTML
+			return $( "<a>" ).text( title ).html();
+		},
+		hide: true,
+		// Disabled elements have inconsistent behavior across browsers (#8661)
+		items: "[title]:not([disabled])",
+		position: {
+			my: "left top+15",
+			at: "left bottom",
+			collision: "flipfit flip"
+		},
+		show: true,
+		tooltipClass: null,
+		track: false,
+
+		// callbacks
+		close: null,
+		open: null
+	},
+
+	_create: function() {
+		this._on({
+			mouseover: "open",
+			focusin: "open"
+		});
+
+		// IDs of generated tooltips, needed for destroy
+		this.tooltips = {};
+		// IDs of parent tooltips where we removed the title attribute
+		this.parents = {};
+
+		if ( this.options.disabled ) {
+			this._disable();
+		}
+	},
+
+	_setOption: function( key, value ) {
+		var that = this;
+
+		if ( key === "disabled" ) {
+			this[ value ? "_disable" : "_enable" ]();
+			this.options[ key ] = value;
+			// disable element style changes
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "content" ) {
+			$.each( this.tooltips, function( id, element ) {
+				that._updateContent( element );
+			});
+		}
+	},
+
+	_disable: function() {
+		var that = this;
+
+		// close open tooltips
+		$.each( this.tooltips, function( id, element ) {
+			var event = $.Event( "blur" );
+			event.target = event.currentTarget = element[0];
+			that.close( event, true );
+		});
+
+		// remove title attributes to prevent native tooltips
+		this.element.find( this.options.items ).addBack().each(function() {
+			var element = $( this );
+			if ( element.is( "[title]" ) ) {
+				element
+					.data( "ui-tooltip-title", element.attr( "title" ) )
+					.attr( "title", "" );
+			}
+		});
+	},
+
+	_enable: function() {
+		// restore title attributes
+		this.element.find( this.options.items ).addBack().each(function() {
+			var element = $( this );
+			if ( element.data( "ui-tooltip-title" ) ) {
+				element.attr( "title", element.data( "ui-tooltip-title" ) );
+			}
+		});
+	},
+
+	open: function( event ) {
+		var that = this,
+			target = $( event ? event.target : this.element )
+				// we need closest here due to mouseover bubbling,
+				// but always pointing at the same event target
+				.closest( this.options.items );
+
+		// No element to show a tooltip for or the tooltip is already open
+		if ( !target.length || target.data( "ui-tooltip-id" ) ) {
+			return;
+		}
+
+		if ( target.attr( "title" ) ) {
+			target.data( "ui-tooltip-title", target.attr( "title" ) );
+		}
+
+		target.data( "ui-tooltip-open", true );
+
+		// kill parent tooltips, custom or native, for hover
+		if ( event && event.type === "mouseover" ) {
+			target.parents().each(function() {
+				var parent = $( this ),
+					blurEvent;
+				if ( parent.data( "ui-tooltip-open" ) ) {
+					blurEvent = $.Event( "blur" );
+					blurEvent.target = blurEvent.currentTarget = this;
+					that.close( blurEvent, true );
+				}
+				if ( parent.attr( "title" ) ) {
+					parent.uniqueId();
+					that.parents[ this.id ] = {
+						element: this,
+						title: parent.attr( "title" )
+					};
+					parent.attr( "title", "" );
+				}
+			});
+		}
+
+		this._updateContent( target, event );
+	},
+
+	_updateContent: function( target, event ) {
+		var content,
+			contentOption = this.options.content,
+			that = this,
+			eventType = event ? event.type : null;
+
+		if ( typeof contentOption === "string" ) {
+			return this._open( event, target, contentOption );
+		}
+
+		content = contentOption.call( target[0], function( response ) {
+			// ignore async response if tooltip was closed already
+			if ( !target.data( "ui-tooltip-open" ) ) {
+				return;
+			}
+			// IE may instantly serve a cached response for ajax requests
+			// delay this call to _open so the other call to _open runs first
+			that._delay(function() {
+				// jQuery creates a special event for focusin when it doesn't
+				// exist natively. To improve performance, the native event
+				// object is reused and the type is changed. Therefore, we can't
+				// rely on the type being correct after the event finished
+				// bubbling, so we set it back to the previous value. (#8740)
+				if ( event ) {
+					event.type = eventType;
+				}
+				this._open( event, target, response );
+			});
+		});
+		if ( content ) {
+			this._open( event, target, content );
+		}
+	},
+
+	_open: function( event, target, content ) {
+		var tooltip, events, delayedShow,
+			positionOption = $.extend( {}, this.options.position );
+
+		if ( !content ) {
+			return;
+		}
+
+		// Content can be updated multiple times. If the tooltip already
+		// exists, then just update the content and bail.
+		tooltip = this._find( target );
+		if ( tooltip.length ) {
+			tooltip.find( ".ui-tooltip-content" ).html( content );
+			return;
+		}
+
+		// if we have a title, clear it to prevent the native tooltip
+		// we have to check first to avoid defining a title if none exists
+		// (we don't want to cause an element to start matching [title])
+		//
+		// We use removeAttr only for key events, to allow IE to export the correct
+		// accessible attributes. For mouse events, set to empty string to avoid
+		// native tooltip showing up (happens only when removing inside mouseover).
+		if ( target.is( "[title]" ) ) {
+			if ( event && event.type === "mouseover" ) {
+				target.attr( "title", "" );
+			} else {
+				target.removeAttr( "title" );
+			}
+		}
+
+		tooltip = this._tooltip( target );
+		addDescribedBy( target, tooltip.attr( "id" ) );
+		tooltip.find( ".ui-tooltip-content" ).html( content );
+
+		function position( event ) {
+			positionOption.of = event;
+			if ( tooltip.is( ":hidden" ) ) {
+				return;
+			}
+			tooltip.position( positionOption );
+		}
+		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
+			this._on( this.document, {
+				mousemove: position
+			});
+			// trigger once to override element-relative positioning
+			position( event );
+		} else {
+			tooltip.position( $.extend({
+				of: target
+			}, this.options.position ) );
+		}
+
+		tooltip.hide();
+
+		this._show( tooltip, this.options.show );
+		// Handle tracking tooltips that are shown with a delay (#8644). As soon
+		// as the tooltip is visible, position the tooltip using the most recent
+		// event.
+		if ( this.options.show && this.options.show.delay ) {
+			delayedShow = this.delayedShow = setInterval(function() {
+				if ( tooltip.is( ":visible" ) ) {
+					position( positionOption.of );
+					clearInterval( delayedShow );
+				}
+			}, $.fx.interval );
+		}
+
+		this._trigger( "open", event, { tooltip: tooltip } );
+
+		events = {
+			keyup: function( event ) {
+				if ( event.keyCode === $.ui.keyCode.ESCAPE ) {
+					var fakeEvent = $.Event(event);
+					fakeEvent.currentTarget = target[0];
+					this.close( fakeEvent, true );
+				}
+			},
+			remove: function() {
+				this._removeTooltip( tooltip );
+			}
+		};
+		if ( !event || event.type === "mouseover" ) {
+			events.mouseleave = "close";
+		}
+		if ( !event || event.type === "focusin" ) {
+			events.focusout = "close";
+		}
+		this._on( true, target, events );
+	},
+
+	close: function( event ) {
+		var that = this,
+			target = $( event ? event.currentTarget : this.element ),
+			tooltip = this._find( target );
+
+		// disabling closes the tooltip, so we need to track when we're closing
+		// to avoid an infinite loop in case the tooltip becomes disabled on close
+		if ( this.closing ) {
+			return;
+		}
+
+		// Clear the interval for delayed tracking tooltips
+		clearInterval( this.delayedShow );
+
+		// only set title if we had one before (see comment in _open())
+		if ( target.data( "ui-tooltip-title" ) ) {
+			target.attr( "title", target.data( "ui-tooltip-title" ) );
+		}
+
+		removeDescribedBy( target );
+
+		tooltip.stop( true );
+		this._hide( tooltip, this.options.hide, function() {
+			that._removeTooltip( $( this ) );
+		});
+
+		target.removeData( "ui-tooltip-open" );
+		this._off( target, "mouseleave focusout keyup" );
+		// Remove 'remove' binding only on delegated targets
+		if ( target[0] !== this.element[0] ) {
+			this._off( target, "remove" );
+		}
+		this._off( this.document, "mousemove" );
+
+		if ( event && event.type === "mouseleave" ) {
+			$.each( this.parents, function( id, parent ) {
+				$( parent.element ).attr( "title", parent.title );
+				delete that.parents[ id ];
+			});
+		}
+
+		this.closing = true;
+		this._trigger( "close", event, { tooltip: tooltip } );
+		this.closing = false;
+	},
+
+	_tooltip: function( element ) {
+		var id = "ui-tooltip-" + increments++,
+			tooltip = $( "<div>" )
+				.attr({
+					id: id,
+					role: "tooltip"
+				})
+				.addClass( "ui-tooltip ui-widget ui-corner-all ui-widget-content " +
+					( this.options.tooltipClass || "" ) );
+		$( "<div>" )
+			.addClass( "ui-tooltip-content" )
+			.appendTo( tooltip );
+		tooltip.appendTo( this.document[0].body );
+		this.tooltips[ id ] = element;
+		return tooltip;
+	},
+
+	_find: function( target ) {
+		var id = target.data( "ui-tooltip-id" );
+		return id ? $( "#" + id ) : $();
+	},
+
+	_removeTooltip: function( tooltip ) {
+		tooltip.remove();
+		delete this.tooltips[ tooltip.attr( "id" ) ];
+	},
+
+	_destroy: function() {
+		var that = this;
+
+		// close open tooltips
+		$.each( this.tooltips, function( id, element ) {
+			// Delegate to close method to handle common cleanup
+			var event = $.Event( "blur" );
+			event.target = event.currentTarget = element[0];
+			that.close( event, true );
+
+			// Remove immediately; destroying an open tooltip doesn't use the
+			// hide animation
+			$( "#" + id ).remove();
+
+			// Restore the title
+			if ( element.data( "ui-tooltip-title" ) ) {
+				element.attr( "title", element.data( "ui-tooltip-title" ) );
+				element.removeData( "ui-tooltip-title" );
+			}
+		});
+	}
+});
+
+}( jQuery ) );
+;(jQuery.effects || (function($, undefined) {
+
+var dataSpace = "ui-effects-";
+
+$.effects = {
+	effect: {}
+};
+
+/*!
+ * jQuery Color Animations v2.1.2
+ * https://github.com/jquery/jquery-color
+ *
+ * Copyright 2013 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * Date: Wed Jan 16 08:47:09 2013 -0600
+ */
+(function( jQuery, undefined ) {
+
+	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
+
+	// plusequals test for += 100 -= 100
+	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
+	// a set of RE's that can match strings and generate color tuples.
+	stringParsers = [{
+			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ],
+					execResult[ 2 ],
+					execResult[ 3 ],
+					execResult[ 4 ]
+				];
+			}
+		}, {
+			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ] * 2.55,
+					execResult[ 2 ] * 2.55,
+					execResult[ 3 ] * 2.55,
+					execResult[ 4 ]
+				];
+			}
+		}, {
+			// this regex ignores A-F because it's compared against an already lowercased string
+			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
+			parse: function( execResult ) {
+				return [
+					parseInt( execResult[ 1 ], 16 ),
+					parseInt( execResult[ 2 ], 16 ),
+					parseInt( execResult[ 3 ], 16 )
+				];
+			}
+		}, {
+			// this regex ignores A-F because it's compared against an already lowercased string
+			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
+			parse: function( execResult ) {
+				return [
+					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
+					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
+					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
+				];
+			}
+		}, {
+			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			space: "hsla",
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ],
+					execResult[ 2 ] / 100,
+					execResult[ 3 ] / 100,
+					execResult[ 4 ]
+				];
+			}
+		}],
+
+	// jQuery.Color( )
+	color = jQuery.Color = function( color, green, blue, alpha ) {
+		return new jQuery.Color.fn.parse( color, green, blue, alpha );
+	},
+	spaces = {
+		rgba: {
+			props: {
+				red: {
+					idx: 0,
+					type: "byte"
+				},
+				green: {
+					idx: 1,
+					type: "byte"
+				},
+				blue: {
+					idx: 2,
+					type: "byte"
+				}
+			}
+		},
+
+		hsla: {
+			props: {
+				hue: {
+					idx: 0,
+					type: "degrees"
+				},
+				saturation: {
+					idx: 1,
+					type: "percent"
+				},
+				lightness: {
+					idx: 2,
+					type: "percent"
+				}
+			}
+		}
+	},
+	propTypes = {
+		"byte": {
+			floor: true,
+			max: 255
+		},
+		"percent": {
+			max: 1
+		},
+		"degrees": {
+			mod: 360,
+			floor: true
+		}
+	},
+	support = color.support = {},
+
+	// element for support tests
+	supportElem = jQuery( "<p>" )[ 0 ],
+
+	// colors = jQuery.Color.names
+	colors,
+
+	// local aliases of functions called often
+	each = jQuery.each;
+
+// determine rgba support immediately
+supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
+support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
+
+// define cache name and alpha properties
+// for rgba and hsla spaces
+each( spaces, function( spaceName, space ) {
+	space.cache = "_" + spaceName;
+	space.props.alpha = {
+		idx: 3,
+		type: "percent",
+		def: 1
+	};
+});
+
+function clamp( value, prop, allowEmpty ) {
+	var type = propTypes[ prop.type ] || {};
+
+	if ( value == null ) {
+		return (allowEmpty || !prop.def) ? null : prop.def;
+	}
+
+	// ~~ is an short way of doing floor for positive numbers
+	value = type.floor ? ~~value : parseFloat( value );
+
+	// IE will pass in empty strings as value for alpha,
+	// which will hit this case
+	if ( isNaN( value ) ) {
+		return prop.def;
+	}
+
+	if ( type.mod ) {
+		// we add mod before modding to make sure that negatives values
+		// get converted properly: -10 -> 350
+		return (value + type.mod) % type.mod;
+	}
+
+	// for now all property types without mod have min and max
+	return 0 > value ? 0 : type.max < value ? type.max : value;
+}
+
+function stringParse( string ) {
+	var inst = color(),
+		rgba = inst._rgba = [];
+
+	string = string.toLowerCase();
+
+	each( stringParsers, function( i, parser ) {
+		var parsed,
+			match = parser.re.exec( string ),
+			values = match && parser.parse( match ),
+			spaceName = parser.space || "rgba";
+
+		if ( values ) {
+			parsed = inst[ spaceName ]( values );
+
+			// if this was an rgba parse the assignment might happen twice
+			// oh well....
+			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
+			rgba = inst._rgba = parsed._rgba;
+
+			// exit each( stringParsers ) here because we matched
+			return false;
+		}
+	});
+
+	// Found a stringParser that handled it
+	if ( rgba.length ) {
+
+		// if this came from a parsed string, force "transparent" when alpha is 0
+		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
+		if ( rgba.join() === "0,0,0,0" ) {
+			jQuery.extend( rgba, colors.transparent );
+		}
+		return inst;
+	}
+
+	// named colors
+	return colors[ string ];
+}
+
+color.fn = jQuery.extend( color.prototype, {
+	parse: function( red, green, blue, alpha ) {
+		if ( red === undefined ) {
+			this._rgba = [ null, null, null, null ];
+			return this;
+		}
+		if ( red.jquery || red.nodeType ) {
+			red = jQuery( red ).css( green );
+			green = undefined;
+		}
+
+		var inst = this,
+			type = jQuery.type( red ),
+			rgba = this._rgba = [];
+
+		// more than 1 argument specified - assume ( red, green, blue, alpha )
+		if ( green !== undefined ) {
+			red = [ red, green, blue, alpha ];
+			type = "array";
+		}
+
+		if ( type === "string" ) {
+			return this.parse( stringParse( red ) || colors._default );
+		}
+
+		if ( type === "array" ) {
+			each( spaces.rgba.props, function( key, prop ) {
+				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
+			});
+			return this;
+		}
+
+		if ( type === "object" ) {
+			if ( red instanceof color ) {
+				each( spaces, function( spaceName, space ) {
+					if ( red[ space.cache ] ) {
+						inst[ space.cache ] = red[ space.cache ].slice();
+					}
+				});
+			} else {
+				each( spaces, function( spaceName, space ) {
+					var cache = space.cache;
+					each( space.props, function( key, prop ) {
+
+						// if the cache doesn't exist, and we know how to convert
+						if ( !inst[ cache ] && space.to ) {
+
+							// if the value was null, we don't need to copy it
+							// if the key was alpha, we don't need to copy it either
+							if ( key === "alpha" || red[ key ] == null ) {
+								return;
+							}
+							inst[ cache ] = space.to( inst._rgba );
+						}
+
+						// this is the only case where we allow nulls for ALL properties.
+						// call clamp with alwaysAllowEmpty
+						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
+					});
+
+					// everything defined but alpha?
+					if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+						// use the default of 1
+						inst[ cache ][ 3 ] = 1;
+						if ( space.from ) {
+							inst._rgba = space.from( inst[ cache ] );
+						}
+					}
+				});
+			}
+			return this;
+		}
+	},
+	is: function( compare ) {
+		var is = color( compare ),
+			same = true,
+			inst = this;
+
+		each( spaces, function( _, space ) {
+			var localCache,
+				isCache = is[ space.cache ];
+			if (isCache) {
+				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
+				each( space.props, function( _, prop ) {
+					if ( isCache[ prop.idx ] != null ) {
+						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
+						return same;
+					}
+				});
+			}
+			return same;
+		});
+		return same;
+	},
+	_space: function() {
+		var used = [],
+			inst = this;
+		each( spaces, function( spaceName, space ) {
+			if ( inst[ space.cache ] ) {
+				used.push( spaceName );
+			}
+		});
+		return used.pop();
+	},
+	transition: function( other, distance ) {
+		var end = color( other ),
+			spaceName = end._space(),
+			space = spaces[ spaceName ],
+			startColor = this.alpha() === 0 ? color( "transparent" ) : this,
+			start = startColor[ space.cache ] || space.to( startColor._rgba ),
+			result = start.slice();
+
+		end = end[ space.cache ];
+		each( space.props, function( key, prop ) {
+			var index = prop.idx,
+				startValue = start[ index ],
+				endValue = end[ index ],
+				type = propTypes[ prop.type ] || {};
+
+			// if null, don't override start value
+			if ( endValue === null ) {
+				return;
+			}
+			// if null - use end
+			if ( startValue === null ) {
+				result[ index ] = endValue;
+			} else {
+				if ( type.mod ) {
+					if ( endValue - startValue > type.mod / 2 ) {
+						startValue += type.mod;
+					} else if ( startValue - endValue > type.mod / 2 ) {
+						startValue -= type.mod;
+					}
+				}
+				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
+			}
+		});
+		return this[ spaceName ]( result );
+	},
+	blend: function( opaque ) {
+		// if we are already opaque - return ourself
+		if ( this._rgba[ 3 ] === 1 ) {
+			return this;
+		}
+
+		var rgb = this._rgba.slice(),
+			a = rgb.pop(),
+			blend = color( opaque )._rgba;
+
+		return color( jQuery.map( rgb, function( v, i ) {
+			return ( 1 - a ) * blend[ i ] + a * v;
+		}));
+	},
+	toRgbaString: function() {
+		var prefix = "rgba(",
+			rgba = jQuery.map( this._rgba, function( v, i ) {
+				return v == null ? ( i > 2 ? 1 : 0 ) : v;
+			});
+
+		if ( rgba[ 3 ] === 1 ) {
+			rgba.pop();
+			prefix = "rgb(";
+		}
+
+		return prefix + rgba.join() + ")";
+	},
+	toHslaString: function() {
+		var prefix = "hsla(",
+			hsla = jQuery.map( this.hsla(), function( v, i ) {
+				if ( v == null ) {
+					v = i > 2 ? 1 : 0;
+				}
+
+				// catch 1 and 2
+				if ( i && i < 3 ) {
+					v = Math.round( v * 100 ) + "%";
+				}
+				return v;
+			});
+
+		if ( hsla[ 3 ] === 1 ) {
+			hsla.pop();
+			prefix = "hsl(";
+		}
+		return prefix + hsla.join() + ")";
+	},
+	toHexString: function( includeAlpha ) {
+		var rgba = this._rgba.slice(),
+			alpha = rgba.pop();
+
+		if ( includeAlpha ) {
+			rgba.push( ~~( alpha * 255 ) );
+		}
+
+		return "#" + jQuery.map( rgba, function( v ) {
+
+			// default to 0 when nulls exist
+			v = ( v || 0 ).toString( 16 );
+			return v.length === 1 ? "0" + v : v;
+		}).join("");
+	},
+	toString: function() {
+		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
+	}
+});
+color.fn.parse.prototype = color.fn;
+
+// hsla conversions adapted from:
+// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
+
+function hue2rgb( p, q, h ) {
+	h = ( h + 1 ) % 1;
+	if ( h * 6 < 1 ) {
+		return p + (q - p) * h * 6;
+	}
+	if ( h * 2 < 1) {
+		return q;
+	}
+	if ( h * 3 < 2 ) {
+		return p + (q - p) * ((2/3) - h) * 6;
+	}
+	return p;
+}
+
+spaces.hsla.to = function ( rgba ) {
+	if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
+		return [ null, null, null, rgba[ 3 ] ];
+	}
+	var r = rgba[ 0 ] / 255,
+		g = rgba[ 1 ] / 255,
+		b = rgba[ 2 ] / 255,
+		a = rgba[ 3 ],
+		max = Math.max( r, g, b ),
+		min = Math.min( r, g, b ),
+		diff = max - min,
+		add = max + min,
+		l = add * 0.5,
+		h, s;
+
+	if ( min === max ) {
+		h = 0;
+	} else if ( r === max ) {
+		h = ( 60 * ( g - b ) / diff ) + 360;
+	} else if ( g === max ) {
+		h = ( 60 * ( b - r ) / diff ) + 120;
+	} else {
+		h = ( 60 * ( r - g ) / diff ) + 240;
+	}
+
+	// chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
+	// otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
+	if ( diff === 0 ) {
+		s = 0;
+	} else if ( l <= 0.5 ) {
+		s = diff / add;
+	} else {
+		s = diff / ( 2 - add );
+	}
+	return [ Math.round(h) % 360, s, l, a == null ? 1 : a ];
+};
+
+spaces.hsla.from = function ( hsla ) {
+	if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
+		return [ null, null, null, hsla[ 3 ] ];
+	}
+	var h = hsla[ 0 ] / 360,
+		s = hsla[ 1 ],
+		l = hsla[ 2 ],
+		a = hsla[ 3 ],
+		q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s,
+		p = 2 * l - q;
+
+	return [
+		Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ),
+		Math.round( hue2rgb( p, q, h ) * 255 ),
+		Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ),
+		a
+	];
+};
+
+
+each( spaces, function( spaceName, space ) {
+	var props = space.props,
+		cache = space.cache,
+		to = space.to,
+		from = space.from;
+
+	// makes rgba() and hsla()
+	color.fn[ spaceName ] = function( value ) {
+
+		// generate a cache for this space if it doesn't exist
+		if ( to && !this[ cache ] ) {
+			this[ cache ] = to( this._rgba );
+		}
+		if ( value === undefined ) {
+			return this[ cache ].slice();
+		}
+
+		var ret,
+			type = jQuery.type( value ),
+			arr = ( type === "array" || type === "object" ) ? value : arguments,
+			local = this[ cache ].slice();
+
+		each( props, function( key, prop ) {
+			var val = arr[ type === "object" ? key : prop.idx ];
+			if ( val == null ) {
+				val = local[ prop.idx ];
+			}
+			local[ prop.idx ] = clamp( val, prop );
+		});
+
+		if ( from ) {
+			ret = color( from( local ) );
+			ret[ cache ] = local;
+			return ret;
+		} else {
+			return color( local );
+		}
+	};
+
+	// makes red() green() blue() alpha() hue() saturation() lightness()
+	each( props, function( key, prop ) {
+		// alpha is included in more than one space
+		if ( color.fn[ key ] ) {
+			return;
+		}
+		color.fn[ key ] = function( value ) {
+			var vtype = jQuery.type( value ),
+				fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ),
+				local = this[ fn ](),
+				cur = local[ prop.idx ],
+				match;
+
+			if ( vtype === "undefined" ) {
+				return cur;
+			}
+
+			if ( vtype === "function" ) {
+				value = value.call( this, cur );
+				vtype = jQuery.type( value );
+			}
+			if ( value == null && prop.empty ) {
+				return this;
+			}
+			if ( vtype === "string" ) {
+				match = rplusequals.exec( value );
+				if ( match ) {
+					value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 );
+				}
+			}
+			local[ prop.idx ] = value;
+			return this[ fn ]( local );
+		};
+	});
+});
+
+// add cssHook and .fx.step function for each named hook.
+// accept a space separated string of properties
+color.hook = function( hook ) {
+	var hooks = hook.split( " " );
+	each( hooks, function( i, hook ) {
+		jQuery.cssHooks[ hook ] = {
+			set: function( elem, value ) {
+				var parsed, curElem,
+					backgroundColor = "";
+
+				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
+					value = color( parsed || value );
+					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
+						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
+						while (
+							(backgroundColor === "" || backgroundColor === "transparent") &&
+							curElem && curElem.style
+						) {
+							try {
+								backgroundColor = jQuery.css( curElem, "backgroundColor" );
+								curElem = curElem.parentNode;
+							} catch ( e ) {
+							}
+						}
+
+						value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
+							backgroundColor :
+							"_default" );
+					}
+
+					value = value.toRgbaString();
+				}
+				try {
+					elem.style[ hook ] = value;
+				} catch( e ) {
+					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
+				}
+			}
+		};
+		jQuery.fx.step[ hook ] = function( fx ) {
+			if ( !fx.colorInit ) {
+				fx.start = color( fx.elem, hook );
+				fx.end = color( fx.end );
+				fx.colorInit = true;
+			}
+			jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
+		};
+	});
+
+};
+
+color.hook( stepHooks );
+
+jQuery.cssHooks.borderColor = {
+	expand: function( value ) {
+		var expanded = {};
+
+		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
+			expanded[ "border" + part + "Color" ] = value;
+		});
+		return expanded;
+	}
+};
+
+// Basic color names only.
+// Usage of any of the other color names requires adding yourself or including
+// jquery.color.svg-names.js.
+colors = jQuery.Color.names = {
+	// 4.1. Basic color keywords
+	aqua: "#00ffff",
+	black: "#000000",
+	blue: "#0000ff",
+	fuchsia: "#ff00ff",
+	gray: "#808080",
+	green: "#008000",
+	lime: "#00ff00",
+	maroon: "#800000",
+	navy: "#000080",
+	olive: "#808000",
+	purple: "#800080",
+	red: "#ff0000",
+	silver: "#c0c0c0",
+	teal: "#008080",
+	white: "#ffffff",
+	yellow: "#ffff00",
+
+	// 4.2.3. "transparent" color keyword
+	transparent: [ null, null, null, 0 ],
+
+	_default: "#ffffff"
+};
+
+})( jQuery );
+
+
+/******************************************************************************/
+/****************************** CLASS ANIMATIONS ******************************/
+/******************************************************************************/
+(function() {
+
+var classAnimationActions = [ "add", "remove", "toggle" ],
+	shorthandStyles = {
+		border: 1,
+		borderBottom: 1,
+		borderColor: 1,
+		borderLeft: 1,
+		borderRight: 1,
+		borderTop: 1,
+		borderWidth: 1,
+		margin: 1,
+		padding: 1
+	};
+
+$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
+	$.fx.step[ prop ] = function( fx ) {
+		if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
+			jQuery.style( fx.elem, prop, fx.end );
+			fx.setAttr = true;
+		}
+	};
+});
+
+function getElementStyles( elem ) {
+	var key, len,
+		style = elem.ownerDocument.defaultView ?
+			elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
+			elem.currentStyle,
+		styles = {};
+
+	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
+		len = style.length;
+		while ( len-- ) {
+			key = style[ len ];
+			if ( typeof style[ key ] === "string" ) {
+				styles[ $.camelCase( key ) ] = style[ key ];
+			}
+		}
+	// support: Opera, IE <9
+	} else {
+		for ( key in style ) {
+			if ( typeof style[ key ] === "string" ) {
+				styles[ key ] = style[ key ];
+			}
+		}
+	}
+
+	return styles;
+}
+
+
+function styleDifference( oldStyle, newStyle ) {
+	var diff = {},
+		name, value;
+
+	for ( name in newStyle ) {
+		value = newStyle[ name ];
+		if ( oldStyle[ name ] !== value ) {
+			if ( !shorthandStyles[ name ] ) {
+				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
+					diff[ name ] = value;
+				}
+			}
+		}
+	}
+
+	return diff;
+}
+
+// support: jQuery <1.8
+if ( !$.fn.addBack ) {
+	$.fn.addBack = function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	};
+}
+
+$.effects.animateClass = function( value, duration, easing, callback ) {
+	var o = $.speed( duration, easing, callback );
+
+	return this.queue( function() {
+		var animated = $( this ),
+			baseClass = animated.attr( "class" ) || "",
+			applyClassChange,
+			allAnimations = o.children ? animated.find( "*" ).addBack() : animated;
+
+		// map the animated objects to store the original styles.
+		allAnimations = allAnimations.map(function() {
+			var el = $( this );
+			return {
+				el: el,
+				start: getElementStyles( this )
+			};
+		});
+
+		// apply class change
+		applyClassChange = function() {
+			$.each( classAnimationActions, function(i, action) {
+				if ( value[ action ] ) {
+					animated[ action + "Class" ]( value[ action ] );
+				}
+			});
+		};
+		applyClassChange();
+
+		// map all animated objects again - calculate new styles and diff
+		allAnimations = allAnimations.map(function() {
+			this.end = getElementStyles( this.el[ 0 ] );
+			this.diff = styleDifference( this.start, this.end );
+			return this;
+		});
+
+		// apply original class
+		animated.attr( "class", baseClass );
+
+		// map all animated objects again - this time collecting a promise
+		allAnimations = allAnimations.map(function() {
+			var styleInfo = this,
+				dfd = $.Deferred(),
+				opts = $.extend({}, o, {
+					queue: false,
+					complete: function() {
+						dfd.resolve( styleInfo );
+					}
+				});
+
+			this.el.animate( this.diff, opts );
+			return dfd.promise();
+		});
+
+		// once all animations have completed:
+		$.when.apply( $, allAnimations.get() ).done(function() {
+
+			// set the final class
+			applyClassChange();
+
+			// for each animated element,
+			// clear all css properties that were animated
+			$.each( arguments, function() {
+				var el = this.el;
+				$.each( this.diff, function(key) {
+					el.css( key, "" );
+				});
+			});
+
+			// this is guarnteed to be there if you use jQuery.speed()
+			// it also handles dequeuing the next anim...
+			o.complete.call( animated[ 0 ] );
+		});
+	});
+};
+
+$.fn.extend({
+	_addClass: $.fn.addClass,
+	addClass: function( classNames, speed, easing, callback ) {
+		return speed ?
+			$.effects.animateClass.call( this,
+				{ add: classNames }, speed, easing, callback ) :
+			this._addClass( classNames );
+	},
+
+	_removeClass: $.fn.removeClass,
+	removeClass: function( classNames, speed, easing, callback ) {
+		return speed ?
+			$.effects.animateClass.call( this,
+				{ remove: classNames }, speed, easing, callback ) :
+			this._removeClass( classNames );
+	},
+
+	_toggleClass: $.fn.toggleClass,
+	toggleClass: function( classNames, force, speed, easing, callback ) {
+		if ( typeof force === "boolean" || force === undefined ) {
+			if ( !speed ) {
+				// without speed parameter
+				return this._toggleClass( classNames, force );
+			} else {
+				return $.effects.animateClass.call( this,
+					(force ? { add: classNames } : { remove: classNames }),
+					speed, easing, callback );
+			}
+		} else {
+			// without force parameter
+			return $.effects.animateClass.call( this,
+				{ toggle: classNames }, force, speed, easing );
+		}
+	},
+
+	switchClass: function( remove, add, speed, easing, callback) {
+		return $.effects.animateClass.call( this, {
+			add: add,
+			remove: remove
+		}, speed, easing, callback );
+	}
+});
+
+})();
+
+/******************************************************************************/
+/*********************************** EFFECTS **********************************/
+/******************************************************************************/
+
+(function() {
+
+$.extend( $.effects, {
+	version: "1.10.0",
+
+	// Saves a set of properties in a data storage
+	save: function( element, set ) {
+		for( var i=0; i < set.length; i++ ) {
+			if ( set[ i ] !== null ) {
+				element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
+			}
+		}
+	},
+
+	// Restores a set of previously saved properties from a data storage
+	restore: function( element, set ) {
+		var val, i;
+		for( i=0; i < set.length; i++ ) {
+			if ( set[ i ] !== null ) {
+				val = element.data( dataSpace + set[ i ] );
+				// support: jQuery 1.6.2
+				// http://bugs.jquery.com/ticket/9917
+				// jQuery 1.6.2 incorrectly returns undefined for any falsy value.
+				// We can't differentiate between "" and 0 here, so we just assume
+				// empty string since it's likely to be a more common value...
+				if ( val === undefined ) {
+					val = "";
+				}
+				element.css( set[ i ], val );
+			}
+		}
+	},
+
+	setMode: function( el, mode ) {
+		if (mode === "toggle") {
+			mode = el.is( ":hidden" ) ? "show" : "hide";
+		}
+		return mode;
+	},
+
+	// Translates a [top,left] array into a baseline value
+	// this should be a little more flexible in the future to handle a string & hash
+	getBaseline: function( origin, original ) {
+		var y, x;
+		switch ( origin[ 0 ] ) {
+			case "top": y = 0; break;
+			case "middle": y = 0.5; break;
+			case "bottom": y = 1; break;
+			default: y = origin[ 0 ] / original.height;
+		}
+		switch ( origin[ 1 ] ) {
+			case "left": x = 0; break;
+			case "center": x = 0.5; break;
+			case "right": x = 1; break;
+			default: x = origin[ 1 ] / original.width;
+		}
+		return {
+			x: x,
+			y: y
+		};
+	},
+
+	// Wraps the element around a wrapper that copies position properties
+	createWrapper: function( element ) {
+
+		// if the element is already wrapped, return it
+		if ( element.parent().is( ".ui-effects-wrapper" )) {
+			return element.parent();
+		}
+
+		// wrap the element
+		var props = {
+				width: element.outerWidth(true),
+				height: element.outerHeight(true),
+				"float": element.css( "float" )
+			},
+			wrapper = $( "<div></div>" )
+				.addClass( "ui-effects-wrapper" )
+				.css({
+					fontSize: "100%",
+					background: "transparent",
+					border: "none",
+					margin: 0,
+					padding: 0
+				}),
+			// Store the size in case width/height are defined in % - Fixes #5245
+			size = {
+				width: element.width(),
+				height: element.height()
+			},
+			active = document.activeElement;
+
+		// support: Firefox
+		// Firefox incorrectly exposes anonymous content
+		// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
+		try {
+			active.id;
+		} catch( e ) {
+			active = document.body;
+		}
+
+		element.wrap( wrapper );
+
+		// Fixes #7595 - Elements lose focus when wrapped.
+		if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+			$( active ).focus();
+		}
+
+		wrapper = element.parent(); //Hotfix for jQuery 1.4 since some change in wrap() seems to actually lose the reference to the wrapped element
+
+		// transfer positioning properties to the wrapper
+		if ( element.css( "position" ) === "static" ) {
+			wrapper.css({ position: "relative" });
+			element.css({ position: "relative" });
+		} else {
+			$.extend( props, {
+				position: element.css( "position" ),
+				zIndex: element.css( "z-index" )
+			});
+			$.each([ "top", "left", "bottom", "right" ], function(i, pos) {
+				props[ pos ] = element.css( pos );
+				if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
+					props[ pos ] = "auto";
+				}
+			});
+			element.css({
+				position: "relative",
+				top: 0,
+				left: 0,
+				right: "auto",
+				bottom: "auto"
+			});
+		}
+		element.css(size);
+
+		return wrapper.css( props ).show();
+	},
+
+	removeWrapper: function( element ) {
+		var active = document.activeElement;
+
+		if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+			element.parent().replaceWith( element );
+
+			// Fixes #7595 - Elements lose focus when wrapped.
+			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+				$( active ).focus();
+			}
+		}
+
+
+		return element;
+	},
+
+	setTransition: function( element, list, factor, value ) {
+		value = value || {};
+		$.each( list, function( i, x ) {
+			var unit = element.cssUnit( x );
+			if ( unit[ 0 ] > 0 ) {
+				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
+			}
+		});
+		return value;
+	}
+});
+
+// return an effect options object for the given parameters:
+function _normalizeArguments( effect, options, speed, callback ) {
+
+	// allow passing all options as the first parameter
+	if ( $.isPlainObject( effect ) ) {
+		options = effect;
+		effect = effect.effect;
+	}
+
+	// convert to an object
+	effect = { effect: effect };
+
+	// catch (effect, null, ...)
+	if ( options == null ) {
+		options = {};
+	}
+
+	// catch (effect, callback)
+	if ( $.isFunction( options ) ) {
+		callback = options;
+		speed = null;
+		options = {};
+	}
+
+	// catch (effect, speed, ?)
+	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
+		callback = speed;
+		speed = options;
+		options = {};
+	}
+
+	// catch (effect, options, callback)
+	if ( $.isFunction( speed ) ) {
+		callback = speed;
+		speed = null;
+	}
+
+	// add options to effect
+	if ( options ) {
+		$.extend( effect, options );
+	}
+
+	speed = speed || options.duration;
+	effect.duration = $.fx.off ? 0 :
+		typeof speed === "number" ? speed :
+		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
+		$.fx.speeds._default;
+
+	effect.complete = callback || options.complete;
+
+	return effect;
+}
+
+function standardSpeed( speed ) {
+	// valid standard speeds
+	if ( !speed || typeof speed === "number" || $.fx.speeds[ speed ] ) {
+		return true;
+	}
+
+	// invalid strings - treat as "normal" speed
+	return typeof speed === "string" && !$.effects.effect[ speed ];
+}
+
+$.fn.extend({
+	effect: function( /* effect, options, speed, callback */ ) {
+		var args = _normalizeArguments.apply( this, arguments ),
+			mode = args.mode,
+			queue = args.queue,
+			effectMethod = $.effects.effect[ args.effect ];
+
+		if ( $.fx.off || !effectMethod ) {
+			// delegate to the original method (e.g., .show()) if possible
+			if ( mode ) {
+				return this[ mode ]( args.duration, args.complete );
+			} else {
+				return this.each( function() {
+					if ( args.complete ) {
+						args.complete.call( this );
+					}
+				});
+			}
+		}
+
+		function run( next ) {
+			var elem = $( this ),
+				complete = args.complete,
+				mode = args.mode;
+
+			function done() {
+				if ( $.isFunction( complete ) ) {
+					complete.call( elem[0] );
+				}
+				if ( $.isFunction( next ) ) {
+					next();
+				}
+			}
+
+			// if the element is hiddden and mode is hide,
+			// or element is visible and mode is show
+			if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
+				done();
+			} else {
+				effectMethod.call( elem[0], args, done );
+			}
+		}
+
+		return queue === false ? this.each( run ) : this.queue( queue || "fx", run );
+	},
+
+	_show: $.fn.show,
+	show: function( speed ) {
+		if ( standardSpeed( speed ) ) {
+			return this._show.apply( this, arguments );
+		} else {
+			var args = _normalizeArguments.apply( this, arguments );
+			args.mode = "show";
+			return this.effect.call( this, args );
+		}
+	},
+
+	_hide: $.fn.hide,
+	hide: function( speed ) {
+		if ( standardSpeed( speed ) ) {
+			return this._hide.apply( this, arguments );
+		} else {
+			var args = _normalizeArguments.apply( this, arguments );
+			args.mode = "hide";
+			return this.effect.call( this, args );
+		}
+	},
+
+	// jQuery core overloads toggle and creates _toggle
+	__toggle: $.fn.toggle,
+	toggle: function( speed ) {
+		if ( standardSpeed( speed ) || typeof speed === "boolean" || $.isFunction( speed ) ) {
+			return this.__toggle.apply( this, arguments );
+		} else {
+			var args = _normalizeArguments.apply( this, arguments );
+			args.mode = "toggle";
+			return this.effect.call( this, args );
+		}
+	},
+
+	// helper functions
+	cssUnit: function(key) {
+		var style = this.css( key ),
+			val = [];
+
+		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
+			if ( style.indexOf( unit ) > 0 ) {
+				val = [ parseFloat( style ), unit ];
+			}
+		});
+		return val;
+	}
+});
+
+})();
+
+/******************************************************************************/
+/*********************************** EASING ***********************************/
+/******************************************************************************/
+
+(function() {
+
+// based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
+
+var baseEasings = {};
+
+$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
+	baseEasings[ name ] = function( p ) {
+		return Math.pow( p, i + 2 );
+	};
+});
+
+$.extend( baseEasings, {
+	Sine: function ( p ) {
+		return 1 - Math.cos( p * Math.PI / 2 );
+	},
+	Circ: function ( p ) {
+		return 1 - Math.sqrt( 1 - p * p );
+	},
+	Elastic: function( p ) {
+		return p === 0 || p === 1 ? p :
+			-Math.pow( 2, 8 * (p - 1) ) * Math.sin( ( (p - 1) * 80 - 7.5 ) * Math.PI / 15 );
+	},
+	Back: function( p ) {
+		return p * p * ( 3 * p - 2 );
+	},
+	Bounce: function ( p ) {
+		var pow2,
+			bounce = 4;
+
+		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
+		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
+	}
+});
+
+$.each( baseEasings, function( name, easeIn ) {
+	$.easing[ "easeIn" + name ] = easeIn;
+	$.easing[ "easeOut" + name ] = function( p ) {
+		return 1 - easeIn( 1 - p );
+	};
+	$.easing[ "easeInOut" + name ] = function( p ) {
+		return p < 0.5 ?
+			easeIn( p * 2 ) / 2 :
+			1 - easeIn( p * -2 + 2 ) / 2;
+	};
+});
+
+})();
+
+})(jQuery));
+(function( $, undefined ) {
+
+var rvertical = /up|down|vertical/,
+	rpositivemotion = /up|left|vertical|horizontal/;
+
+$.effects.effect.blind = function( o, done ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		direction = o.direction || "up",
+		vertical = rvertical.test( direction ),
+		ref = vertical ? "height" : "width",
+		ref2 = vertical ? "top" : "left",
+		motion = rpositivemotion.test( direction ),
+		animation = {},
+		show = mode === "show",
+		wrapper, distance, margin;
+
+	// if already wrapped, the wrapper's properties are my property. #6245
+	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
+		$.effects.save( el.parent(), props );
+	} else {
+		$.effects.save( el, props );
+	}
+	el.show();
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+
+	distance = wrapper[ ref ]();
+	margin = parseFloat( wrapper.css( ref2 ) ) || 0;
+
+	animation[ ref ] = show ? distance : 0;
+	if ( !motion ) {
+		el
+			.css( vertical ? "bottom" : "right", 0 )
+			.css( vertical ? "top" : "left", "auto" )
+			.css({ position: "absolute" });
+
+		animation[ ref2 ] = show ? margin : distance + margin;
+	}
+
+	// start at 0 if we are showing
+	if ( show ) {
+		wrapper.css( ref, 0 );
+		if ( ! motion ) {
+			wrapper.css( ref2, margin + distance );
+		}
+	}
+
+	// Animate
+	wrapper.animate( animation, {
+		duration: o.duration,
+		easing: o.easing,
+		queue: false,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.bounce = function( o, done ) {
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+
+		// defaults:
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		hide = mode === "hide",
+		show = mode === "show",
+		direction = o.direction || "up",
+		distance = o.distance,
+		times = o.times || 5,
+
+		// number of internal animations
+		anims = times * 2 + ( show || hide ? 1 : 0 ),
+		speed = o.duration / anims,
+		easing = o.easing,
+
+		// utility:
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ),
+		i,
+		upAnim,
+		downAnim,
+
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+
+	// Avoid touching opacity to prevent clearType and PNG issues in IE
+	if ( show || hide ) {
+		props.push( "opacity" );
+	}
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el ); // Create Wrapper
+
+	// default distance for the BIGGEST bounce is the outer Distance / 3
+	if ( !distance ) {
+		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
+	}
+
+	if ( show ) {
+		downAnim = { opacity: 1 };
+		downAnim[ ref ] = 0;
+
+		// if we are showing, force opacity 0 and set the initial position
+		// then do the "first" animation
+		el.css( "opacity", 0 )
+			.css( ref, motion ? -distance * 2 : distance * 2 )
+			.animate( downAnim, speed, easing );
+	}
+
+	// start at the smallest distance if we are hiding
+	if ( hide ) {
+		distance = distance / Math.pow( 2, times - 1 );
+	}
+
+	downAnim = {};
+	downAnim[ ref ] = 0;
+	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
+	for ( i = 0; i < times; i++ ) {
+		upAnim = {};
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		el.animate( upAnim, speed, easing )
+			.animate( downAnim, speed, easing );
+
+		distance = hide ? distance * 2 : distance / 2;
+	}
+
+	// Last Bounce when Hiding
+	if ( hide ) {
+		upAnim = { opacity: 0 };
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		el.animate( upAnim, speed, easing );
+	}
+
+	el.queue(function() {
+		if ( hide ) {
+			el.hide();
+		}
+		$.effects.restore( el, props );
+		$.effects.removeWrapper( el );
+		done();
+	});
+
+	// inject all the animations we just queued to be first in line (after "inprogress")
+	if ( queuelen > 1) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	el.dequeue();
+
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.clip = function( o, done ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "vertical",
+		vert = direction === "vertical",
+		size = vert ? "height" : "width",
+		position = vert ? "top" : "left",
+		animation = {},
+		wrapper, animate, distance;
+
+	// Save & Show
+	$.effects.save( el, props );
+	el.show();
+
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
+	distance = animate[ size ]();
+
+	// Shift
+	if ( show ) {
+		animate.css( size, 0 );
+		animate.css( position, distance / 2 );
+	}
+
+	// Create Animation Object:
+	animation[ size ] = show ? distance : 0;
+	animation[ position ] = show ? 0 : distance / 2;
+
+	// Animate
+	animate.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( !show ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.drop = function( o, done ) {
+
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "left",
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
+		animation = {
+			opacity: show ? 1 : 0
+		},
+		distance;
+
+	// Adjust
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+
+	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]( true ) / 2;
+
+	if ( show ) {
+		el
+			.css( "opacity", 0 )
+			.css( ref, motion === "pos" ? -distance : distance );
+	}
+
+	// Animation
+	animation[ ref ] = ( show ?
+		( motion === "pos" ? "+=" : "-=" ) :
+		( motion === "pos" ? "-=" : "+=" ) ) +
+		distance;
+
+	// Animate
+	el.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.explode = function( o, done ) {
+
+	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
+		cells = rows,
+		el = $( this ),
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+
+		// show and then visibility:hidden the element before calculating offset
+		offset = el.show().css( "visibility", "hidden" ).offset(),
+
+		// width and height of a piece
+		width = Math.ceil( el.outerWidth() / cells ),
+		height = Math.ceil( el.outerHeight() / rows ),
+		pieces = [],
+
+		// loop
+		i, j, left, top, mx, my;
+
+	// children animate complete:
+	function childComplete() {
+		pieces.push( this );
+		if ( pieces.length === rows * cells ) {
+			animComplete();
+		}
+	}
+
+	// clone the element for each row and cell.
+	for( i = 0; i < rows ; i++ ) { // ===>
+		top = offset.top + i * height;
+		my = i - ( rows - 1 ) / 2 ;
+
+		for( j = 0; j < cells ; j++ ) { // |||
+			left = offset.left + j * width;
+			mx = j - ( cells - 1 ) / 2 ;
+
+			// Create a clone of the now hidden main element that will be absolute positioned
+			// within a wrapper div off the -left and -top equal to size of our pieces
+			el
+				.clone()
+				.appendTo( "body" )
+				.wrap( "<div></div>" )
+				.css({
+					position: "absolute",
+					visibility: "visible",
+					left: -j * width,
+					top: -i * height
+				})
+
+			// select the wrapper - make it overflow: hidden and absolute positioned based on
+			// where the original was located +left and +top equal to the size of pieces
+				.parent()
+				.addClass( "ui-effects-explode" )
+				.css({
+					position: "absolute",
+					overflow: "hidden",
+					width: width,
+					height: height,
+					left: left + ( show ? mx * width : 0 ),
+					top: top + ( show ? my * height : 0 ),
+					opacity: show ? 0 : 1
+				}).animate({
+					left: left + ( show ? 0 : mx * width ),
+					top: top + ( show ? 0 : my * height ),
+					opacity: show ? 1 : 0
+				}, o.duration || 500, o.easing, childComplete );
+		}
+	}
+
+	function animComplete() {
+		el.css({
+			visibility: "visible"
+		});
+		$( pieces ).remove();
+		if ( !show ) {
+			el.hide();
+		}
+		done();
+	}
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.fade = function( o, done ) {
+	var el = $( this ),
+		mode = $.effects.setMode( el, o.mode || "toggle" );
+
+	el.animate({
+		opacity: mode
+	}, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: done
+	});
+};
+
+})( jQuery );
+(function( $, undefined ) {
+
+$.effects.effect.fold = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		size = o.size || 15,
+		percent = /([0-9]+)%/.exec( size ),
+		horizFirst = !!o.horizFirst,
+		widthFirst = show !== horizFirst,
+		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
+		duration = o.duration / 2,
+		wrapper, distance,
+		animation1 = {},
+		animation2 = {};
+
+	$.effects.save( el, props );
+	el.show();
+
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	distance = widthFirst ?
+		[ wrapper.width(), wrapper.height() ] :
+		[ wrapper.height(), wrapper.width() ];
+
+	if ( percent ) {
+		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
+	}
+	if ( show ) {
+		wrapper.css( horizFirst ? {
+			height: 0,
+			width: size
+		} : {
+			height: size,
+			width: 0
+		});
+	}
+
+	// Animation
+	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
+	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
+
+	// Animate
+	wrapper
+		.animate( animation1, duration, o.easing )
+		.animate( animation2, duration, o.easing, function() {
+			if ( hide ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
+
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.highlight = function( o, done ) {
+	var elem = $( this ),
+		props = [ "backgroundImage", "backgroundColor", "opacity" ],
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		animation = {
+			backgroundColor: elem.css( "backgroundColor" )
+		};
+
+	if (mode === "hide") {
+		animation.opacity = 0;
+	}
+
+	$.effects.save( elem, props );
+
+	elem
+		.show()
+		.css({
+			backgroundImage: "none",
+			backgroundColor: o.color || "#ffff99"
+		})
+		.animate( animation, {
+			queue: false,
+			duration: o.duration,
+			easing: o.easing,
+			complete: function() {
+				if ( mode === "hide" ) {
+					elem.hide();
+				}
+				$.effects.restore( elem, props );
+				done();
+			}
+		});
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.pulsate = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		showhide = ( show || mode === "hide" ),
+
+		// showing or hiding leaves of the "last" animation
+		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
+		duration = o.duration / anims,
+		animateTo = 0,
+		queue = elem.queue(),
+		queuelen = queue.length,
+		i;
+
+	if ( show || !elem.is(":visible")) {
+		elem.css( "opacity", 0 ).show();
+		animateTo = 1;
+	}
+
+	// anims - 1 opacity "toggles"
+	for ( i = 1; i < anims; i++ ) {
+		elem.animate({
+			opacity: animateTo
+		}, duration, o.easing );
+		animateTo = 1 - animateTo;
+	}
+
+	elem.animate({
+		opacity: animateTo
+	}, duration, o.easing);
+
+	elem.queue(function() {
+		if ( hide ) {
+			elem.hide();
+		}
+		done();
+	});
+
+	// We just queued up "anims" animations, we need to put them next in the queue
+	if ( queuelen > 1 ) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	elem.dequeue();
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.puff = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "hide" ),
+		hide = mode === "hide",
+		percent = parseInt( o.percent, 10 ) || 150,
+		factor = percent / 100,
+		original = {
+			height: elem.height(),
+			width: elem.width(),
+			outerHeight: elem.outerHeight(),
+			outerWidth: elem.outerWidth()
+		};
+
+	$.extend( o, {
+		effect: "scale",
+		queue: false,
+		fade: true,
+		mode: mode,
+		complete: done,
+		percent: hide ? percent : 100,
+		from: hide ?
+			original :
+			{
+				height: original.height * factor,
+				width: original.width * factor,
+				outerHeight: original.outerHeight * factor,
+				outerWidth: original.outerWidth * factor
+			}
+	});
+
+	elem.effect( o );
+};
+
+$.effects.effect.scale = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		options = $.extend( true, {}, o ),
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		percent = parseInt( o.percent, 10 ) ||
+			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
+		direction = o.direction || "both",
+		origin = o.origin,
+		original = {
+			height: el.height(),
+			width: el.width(),
+			outerHeight: el.outerHeight(),
+			outerWidth: el.outerWidth()
+		},
+		factor = {
+			y: direction !== "horizontal" ? (percent / 100) : 1,
+			x: direction !== "vertical" ? (percent / 100) : 1
+		};
+
+	// We are going to pass this effect to the size effect:
+	options.effect = "size";
+	options.queue = false;
+	options.complete = done;
+
+	// Set default origin and restore for show/hide
+	if ( mode !== "effect" ) {
+		options.origin = origin || ["middle","center"];
+		options.restore = true;
+	}
+
+	options.from = o.from || ( mode === "show" ? {
+		height: 0,
+		width: 0,
+		outerHeight: 0,
+		outerWidth: 0
+	} : original );
+	options.to = {
+		height: original.height * factor.y,
+		width: original.width * factor.x,
+		outerHeight: original.outerHeight * factor.y,
+		outerWidth: original.outerWidth * factor.x
+	};
+
+	// Fade option to support puff
+	if ( options.fade ) {
+		if ( mode === "show" ) {
+			options.from.opacity = 0;
+			options.to.opacity = 1;
+		}
+		if ( mode === "hide" ) {
+			options.from.opacity = 1;
+			options.to.opacity = 0;
+		}
+	}
+
+	// Animate
+	el.effect( options );
+
+};
+
+$.effects.effect.size = function( o, done ) {
+
+	// Create element
+	var original, baseline, factor,
+		el = $( this ),
+		props0 = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
+
+		// Always restore
+		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
+
+		// Copy for children
+		props2 = [ "width", "height", "overflow" ],
+		cProps = [ "fontSize" ],
+		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
+		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
+
+		// Set options
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		restore = o.restore || mode !== "effect",
+		scale = o.scale || "both",
+		origin = o.origin || [ "middle", "center" ],
+		position = el.css( "position" ),
+		props = restore ? props0 : props1,
+		zero = {
+			height: 0,
+			width: 0,
+			outerHeight: 0,
+			outerWidth: 0
+		};
+
+	if ( mode === "show" ) {
+		el.show();
+	}
+	original = {
+		height: el.height(),
+		width: el.width(),
+		outerHeight: el.outerHeight(),
+		outerWidth: el.outerWidth()
+	};
+
+	if ( o.mode === "toggle" && mode === "show" ) {
+		el.from = o.to || zero;
+		el.to = o.from || original;
+	} else {
+		el.from = o.from || ( mode === "show" ? zero : original );
+		el.to = o.to || ( mode === "hide" ? zero : original );
+	}
+
+	// Set scaling factor
+	factor = {
+		from: {
+			y: el.from.height / original.height,
+			x: el.from.width / original.width
+		},
+		to: {
+			y: el.to.height / original.height,
+			x: el.to.width / original.width
+		}
+	};
+
+	// Scale the css box
+	if ( scale === "box" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			props = props.concat( vProps );
+			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
+			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
+		}
+
+		// Horizontal props scaling
+		if ( factor.from.x !== factor.to.x ) {
+			props = props.concat( hProps );
+			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
+			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
+		}
+	}
+
+	// Scale the content
+	if ( scale === "content" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			props = props.concat( cProps ).concat( props2 );
+			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
+			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
+		}
+	}
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+	el.css( "overflow", "hidden" ).css( el.from );
+
+	// Adjust
+	if (origin) { // Calculate baseline shifts
+		baseline = $.effects.getBaseline( origin, original );
+		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
+		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
+		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
+		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
+	}
+	el.css( el.from ); // set top & left
+
+	// Animate
+	if ( scale === "content" || scale === "both" ) { // Scale the children
+
+		// Add margins/font-size
+		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
+		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
+		props2 = props0.concat(vProps).concat(hProps);
+
+		el.find( "*[width]" ).each( function(){
+			var child = $( this ),
+				c_original = {
+					height: child.height(),
+					width: child.width(),
+					outerHeight: child.outerHeight(),
+					outerWidth: child.outerWidth()
+				};
+			if (restore) {
+				$.effects.save(child, props2);
+			}
+
+			child.from = {
+				height: c_original.height * factor.from.y,
+				width: c_original.width * factor.from.x,
+				outerHeight: c_original.outerHeight * factor.from.y,
+				outerWidth: c_original.outerWidth * factor.from.x
+			};
+			child.to = {
+				height: c_original.height * factor.to.y,
+				width: c_original.width * factor.to.x,
+				outerHeight: c_original.height * factor.to.y,
+				outerWidth: c_original.width * factor.to.x
+			};
+
+			// Vertical props scaling
+			if ( factor.from.y !== factor.to.y ) {
+				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
+				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
+			}
+
+			// Horizontal props scaling
+			if ( factor.from.x !== factor.to.x ) {
+				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
+				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
+			}
+
+			// Animate children
+			child.css( child.from );
+			child.animate( child.to, o.duration, o.easing, function() {
+
+				// Restore children
+				if ( restore ) {
+					$.effects.restore( child, props2 );
+				}
+			});
+		});
+	}
+
+	// Animate
+	el.animate( el.to, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( el.to.opacity === 0 ) {
+				el.css( "opacity", el.from.opacity );
+			}
+			if( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			if ( !restore ) {
+
+				// we need to calculate our new positioning based on the scaling
+				if ( position === "static" ) {
+					el.css({
+						position: "relative",
+						top: el.to.top,
+						left: el.to.left
+					});
+				} else {
+					$.each([ "top", "left" ], function( idx, pos ) {
+						el.css( pos, function( _, str ) {
+							var val = parseInt( str, 10 ),
+								toRef = idx ? el.to.left : el.to.top;
+
+							// if original was "auto", recalculate the new value from wrapper
+							if ( str === "auto" ) {
+								return toRef + "px";
+							}
+
+							return val + toRef + "px";
+						});
+					});
+				}
+			}
+
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.shake = function( o, done ) {
+
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		direction = o.direction || "left",
+		distance = o.distance || 20,
+		times = o.times || 3,
+		anims = times * 2 + 1,
+		speed = Math.round(o.duration/anims),
+		ref = (direction === "up" || direction === "down") ? "top" : "left",
+		positiveMotion = (direction === "up" || direction === "left"),
+		animation = {},
+		animation1 = {},
+		animation2 = {},
+		i,
+
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+
+	// Animation
+	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
+	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
+	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
+
+	// Animate
+	el.animate( animation, speed, o.easing );
+
+	// Shakes
+	for ( i = 1; i < times; i++ ) {
+		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
+	}
+	el
+		.animate( animation1, speed, o.easing )
+		.animate( animation, speed / 2, o.easing )
+		.queue(function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
+
+	// inject all the animations we just queued to be first in line (after "inprogress")
+	if ( queuelen > 1) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	el.dequeue();
+
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.slide = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
+		mode = $.effects.setMode( el, o.mode || "show" ),
+		show = mode === "show",
+		direction = o.direction || "left",
+		ref = (direction === "up" || direction === "down") ? "top" : "left",
+		positiveMotion = (direction === "up" || direction === "left"),
+		distance,
+		animation = {};
+
+	// Adjust
+	$.effects.save( el, props );
+	el.show();
+	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true );
+
+	$.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+
+	if ( show ) {
+		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
+	}
+
+	// Animation
+	animation[ ref ] = ( show ?
+		( positiveMotion ? "+=" : "-=") :
+		( positiveMotion ? "-=" : "+=")) +
+		distance;
+
+	// Animate
+	el.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+};
+
+})(jQuery);
+(function( $, undefined ) {
+
+$.effects.effect.transfer = function( o, done ) {
+	var elem = $( this ),
+		target = $( o.to ),
+		targetFixed = target.css( "position" ) === "fixed",
+		body = $("body"),
+		fixTop = targetFixed ? body.scrollTop() : 0,
+		fixLeft = targetFixed ? body.scrollLeft() : 0,
+		endPosition = target.offset(),
+		animation = {
+			top: endPosition.top - fixTop ,
+			left: endPosition.left - fixLeft ,
+			height: target.innerHeight(),
+			width: target.innerWidth()
+		},
+		startPosition = elem.offset(),
+		transfer = $( "<div class='ui-effects-transfer'></div>" )
+			.appendTo( document.body )
+			.addClass( o.className )
+			.css({
+				top: startPosition.top - fixTop ,
+				left: startPosition.left - fixLeft ,
+				height: elem.innerHeight(),
+				width: elem.innerWidth(),
+				position: targetFixed ? "fixed" : "absolute"
+			})
+			.animate( animation, o.duration, o.easing, function() {
+				transfer.remove();
+				done();
+			});
+};
+
+})(jQuery);
diff --git a/core/js/jquery-ui-1.8.16.custom.min.js b/core/js/jquery-ui-1.8.16.custom.min.js
deleted file mode 100644
index eefefa8579d7d2941047dfaaeac71fb2e42ae1ef..0000000000000000000000000000000000000000
--- a/core/js/jquery-ui-1.8.16.custom.min.js
+++ /dev/null
@@ -1,761 +0,0 @@
-/*!
- * jQuery UI 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI
- */
-(function(c,j){function k(a,b){var d=a.nodeName.toLowerCase();if("area"===d){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&l(a)}return(/input|select|textarea|button|object/.test(d)?!a.disabled:"a"==d?a.href||b:b)&&l(a)}function l(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.16",
-keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({propAttr:c.fn.prop||c.fn.attr,_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=
-this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,
-"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":
-"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,m,n){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(m)g-=parseFloat(c.curCSS(f,"border"+this+"Width",true))||0;if(n)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,
-outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){return k(a,!isNaN(c.attr(a,"tabindex")))},tabbable:function(a){var b=c.attr(a,
-"tabindex"),d=isNaN(b);return(d||b>=0)&&k(a,!d)}});c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&
-a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&
-c.ui.isOverAxis(b,e,i)}})}})(jQuery);
-;/*!
- * jQuery UI Widget 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Widget
- */
-(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)try{b(d).triggerHandler("remove")}catch(e){}k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){try{b(this).triggerHandler("remove")}catch(d){}});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=
-function(h){return!!b.data(h,a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):
-d;if(e&&d.charAt(0)==="_")return h;e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=
-b.extend(true,{},this.options,this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
-"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",
-c);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
-;/*!
- * jQuery UI Mouse 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- *	jquery.ui.widget.js
- */
-(function(b){var d=false;b(document).mouseup(function(){d=false});b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
-this.widgetName)},_mouseDown:function(a){if(!d){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,f=a.which==1,g=typeof this.options.cancel=="string"&&a.target.nodeName?b(a.target).closest(this.options.cancel).length:false;if(!f||g||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
-this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(e){return c._mouseMove(e)};this._mouseUpDelegate=function(e){return c._mouseUp(e)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return d=true}},_mouseMove:function(a){if(b.browser.msie&&
-!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
-false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
-;/*
- * jQuery UI Position 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Position
- */
-(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
-left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
-k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
-m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
-d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
-a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
-g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
-;/*
- * jQuery UI Draggable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Draggables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
-"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
-this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;if(b.iframeFix)d(b.iframeFix===true?"iframe":b.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")});return true},_mouseStart:function(a){var b=this.options;
-this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
-this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);d.ui.ddmanager&&d.ui.ddmanager.dragStart(this,a);return true},
-_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=
-false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
-10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},_mouseUp:function(a){this.options.iframeFix===true&&d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});d.ui.ddmanager&&d.ui.ddmanager.dragStop(this,a);return d.ui.mouse.prototype._mouseUp.call(this,a)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||
-!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone().removeAttr("id"):this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&
-a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
-this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
-10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
-10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[a.containment=="document"?0:d(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,a.containment=="document"?0:d(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
-(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){a=d(a.containment);var b=a[0];if(b){a.offset();var c=d(b).css("overflow")!=
-"hidden";this.containment=[(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),
-10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=a}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+
-this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&
-!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,h=a.pageY;if(this.originalPosition){var g;if(this.containment){if(this.relative_container){g=this.relative_container.offset();g=[this.containment[0]+g.left,this.containment[1]+g.top,this.containment[2]+g.left,this.containment[3]+g.top]}else g=this.containment;if(a.pageX-this.offset.click.left<g[0])e=g[0]+this.offset.click.left;
-if(a.pageY-this.offset.click.top<g[1])h=g[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>g[2])e=g[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>g[3])h=g[3]+this.offset.click.top}if(b.grid){h=b.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/b.grid[1])*b.grid[1]:this.originalPageY;h=g?!(h-this.offset.click.top<g[1]||h-this.offset.click.top>g[3])?h:!(h-this.offset.click.top<g[1])?h-b.grid[1]:h+b.grid[1]:h;e=b.grid[0]?this.originalPageX+Math.round((e-this.originalPageX)/
-b.grid[0])*b.grid[0]:this.originalPageX;e=g?!(e-this.offset.click.left<g[0]||e-this.offset.click.left>g[2])?e:!(e-this.offset.click.left<g[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<
-526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,
-c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.16"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var h=d.data(this,"sortable");if(h&&!h.options.disabled){c.sortables.push({instance:h,shouldRevert:h.options.revert});
-h.refreshPositions();h._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
-false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
-this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;
-c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
-this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=
-a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!=
-"x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<
-c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-
-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,
-width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),f=c.options,e=f.snapTolerance,h=b.offset.left,g=h+c.helperProportions.width,n=b.offset.top,o=n+c.helperProportions.height,i=c.snapElements.length-1;i>=0;i--){var j=c.snapElements[i].left,l=j+c.snapElements[i].width,k=c.snapElements[i].top,m=k+c.snapElements[i].height;if(j-e<h&&h<l+e&&k-e<n&&n<m+e||j-e<h&&h<l+e&&k-e<o&&o<m+e||j-e<g&&g<l+e&&k-e<n&&n<m+e||j-e<g&&g<l+e&&k-e<o&&
-o<m+e){if(f.snapMode!="inner"){var p=Math.abs(k-o)<=e,q=Math.abs(m-n)<=e,r=Math.abs(j-g)<=e,s=Math.abs(l-h)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l}).left-c.margins.left}var t=
-p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(k-n)<=e;q=Math.abs(m-o)<=e;r=Math.abs(j-h)<=e;s=Math.abs(l-g)<=e;if(p)b.position.top=c._convertPositionTo("relative",{top:k,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:m-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:j}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:l-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[i].snapping&&
-(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=p||q||r||s||t}else{c.snapElements[i].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[i].item}));c.snapElements[i].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),
-10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
-;/*
- * jQuery UI Droppable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Droppables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.mouse.js
- *	jquery.ui.draggable.js
- */
-(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
-a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
-this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
-this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
-d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
-a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.16"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
-switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
-i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
-"none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
-a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},dragStart:function(a,b){a.element.parents(":not(body,html)").bind("scroll.droppable",function(){a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)})},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);
-if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})},dragStop:function(a,b){a.element.parents(":not(body,html)").unbind("scroll.droppable");
-a.options.refreshPositions||d.ui.ddmanager.prepareOffsets(a,b)}}})(jQuery);
-;/*
- * jQuery UI Resizable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
-_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
-top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
-this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
-nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
-String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),l=0;l=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,l);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
-this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){if(!a.disabled){e(this).removeClass("ui-resizable-autohide");b._handles.show()}},function(){if(!a.disabled)if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
-var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=
-false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});
-this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff=
-{width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];
-if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);this._updateVirtualBoundaries(b.shiftKey);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},
-_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,
-{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(b){var a=this.options,c,d,f;a={minWidth:k(a.minWidth)?a.minWidth:0,maxWidth:k(a.maxWidth)?a.maxWidth:Infinity,minHeight:k(a.minHeight)?a.minHeight:0,maxHeight:k(a.maxHeight)?a.maxHeight:
-Infinity};if(this._aspectRatio||b){b=a.minHeight*this.aspectRatio;d=a.minWidth/this.aspectRatio;c=a.maxHeight*this.aspectRatio;f=a.maxWidth/this.aspectRatio;if(b>a.minWidth)a.minWidth=b;if(d>a.minHeight)a.minHeight=d;if(c<a.maxWidth)a.maxWidth=c;if(f<a.maxHeight)a.maxHeight=f}this._vBoundaries=a},_updateCache:function(b){this.offset=this.helper.offset();if(k(b.left))this.position.left=b.left;if(k(b.top))this.position.top=b.top;if(k(b.height))this.size.height=b.height;if(k(b.width))this.size.width=
-b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(k(b.height))b.width=b.height*this.aspectRatio;else if(k(b.width))b.height=b.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this._vBoundaries,c=this.axis,d=k(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=k(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=k(b.width)&&a.minWidth&&
-a.minWidth>b.width,h=k(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+this.size.height,l=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&l)b.left=i-a.minWidth;if(d&&l)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=
-null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||
-0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
-a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+
-c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);
-b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.16"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),
-10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-
-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var l=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:l.parents(a.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(l.css("position"))){c._revertToRelativePosition=true;l.css({position:"absolute",top:"auto",left:"auto"})}l.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?
-e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=
-e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,
-step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=
-e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;
-var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:
-a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-
-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,
-f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,
-display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=
-e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=
-d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},k=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
-;/*
- * jQuery UI Selectable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Selectables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
-selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
-c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
-c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
-this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
-a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
-!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
-e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.16"})})(jQuery);
-;/*
- * jQuery UI Sortable 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var a=this.options;this.containerCache={};this.element.addClass("ui-sortable");
-this.refresh();this.floating=this.items.length?a.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a===
-"disabled"){this.options[a]=b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&
-!b){var f=false;d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
-left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
-this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=
-document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);
-return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<
-b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
-b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,
-a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],
-e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();
-c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
-this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,
-dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},
-toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
-this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();
-var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},
-_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();
-if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
-this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),
-this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&
-this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=
-this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=
-d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||
-0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",
-a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
-f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=
-this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==
-""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=
-this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a=
-{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
-10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?
-document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
-10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=
-this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&
-this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
-var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-
-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],
-this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]=
-"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",
-f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,
-this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",
-a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
-_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.16"})})(jQuery);
-;/*
- * jQuery UI Autocomplete 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Autocomplete
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.position.js
- */
-(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.propAttr("readOnly"))){g=
-false;var f=d.ui.keyCode;switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=
-a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(g){g=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};
-this.menu=d("<ul></ul>").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&&
-a.element.val(f.value)},selected:function(c,f){var h=f.item.data("item.autocomplete"),i=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=i;setTimeout(function(){a.previous=i;a.selectedItem=h},1)}false!==a._trigger("select",c,{item:h})&&a.element.val(h.value);a.term=a.element.val();a.close(c);a.selectedItem=h},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
-d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&&
-b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,g;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,f){f(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source==="string"){g=this.options.source;this.source=function(c,f){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:g,data:c,dataType:"json",autocompleteRequest:++e,success:function(h){this.autocompleteRequest===e&&f(h)},error:function(){this.autocompleteRequest===e&&f([])}})}}else this.source=
-this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==false)return this._search(a)},_search:function(a){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(!this.options.disabled&&a&&a.length){a=this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();
-this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",a)}},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return d.map(a,function(b){if(typeof b==="string")return{label:b,value:b};return d.extend({label:b.label||
-b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();b.show();this._resizeMenu();b.position(d.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new d.Event("mouseover"))},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(a,b){var g=this;
-d.each(b,function(c,f){g._renderItem(a,f)})},_renderItem:function(a,b){return d("<li></li>").data("item.autocomplete",b).append(d("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
-"\\$&")},filter:function(a,b){var g=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return g.test(c.label||c.value||c)})}})})(jQuery);
-(function(d){d.widget("ui.menu",{_create:function(){var e=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(a){if(d(a.target).closest(".ui-menu-item a").length){a.preventDefault();e.select(a)}});this.refresh()},refresh:function(){var e=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
--1).mouseenter(function(a){e.activate(a,d(this).parent())}).mouseleave(function(){e.deactivate()})},activate:function(e,a){this.deactivate();if(this.hasScroll()){var b=a.offset().top-this.element.offset().top,g=this.element.scrollTop(),c=this.element.height();if(b<0)this.element.scrollTop(g+b);else b>=c&&this.element.scrollTop(g+b-c+a.height())}this.active=a.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",e,{item:a})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");
-this._trigger("blur");this.active=null}},next:function(e){this.move("next",".ui-menu-item:first",e)},previous:function(e){this.move("prev",".ui-menu-item:last",e)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(e,a,b){if(this.active){e=this.active[e+"All"](".ui-menu-item").eq(0);e.length?this.activate(b,e):this.activate(b,this.element.children(a))}else this.activate(b,
-this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.active||this.last())this.activate(e,this.element.children(".ui-menu-item:first"));else{var a=this.active.offset().top,b=this.element.height(),g=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-a-b+d(this).height();return c<10&&c>-10});g.length||(g=this.element.children(".ui-menu-item:last"));this.activate(e,g)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||
-this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||
-this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[d.fn.prop?"prop":"attr"]("scrollHeight")},select:function(e){this._trigger("selected",e,{item:this.active})}})})(jQuery);
-;/*
- * jQuery UI Button 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Button
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(b){var h,i,j,g,l=function(){var a=b(this).find(":ui-button");setTimeout(function(){a.button("refresh")},1)},k=function(a){var c=a.name,e=a.form,f=b([]);if(c)f=e?b(e).find("[name='"+c+"']"):b("[name='"+c+"']",a.ownerDocument).filter(function(){return!this.form});return f};b.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",l);if(typeof this.options.disabled!==
-"boolean")this.options.disabled=this.element.propAttr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var a=this,c=this.options,e=this.type==="checkbox"||this.type==="radio",f="ui-state-hover"+(!e?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!c.disabled){b(this).addClass("ui-state-hover");
-this===h&&b(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||b(this).removeClass(f)}).bind("click.button",function(d){if(c.disabled){d.preventDefault();d.stopImmediatePropagation()}});this.element.bind("focus.button",function(){a.buttonElement.addClass("ui-state-focus")}).bind("blur.button",function(){a.buttonElement.removeClass("ui-state-focus")});if(e){this.element.bind("change.button",function(){g||a.refresh()});this.buttonElement.bind("mousedown.button",function(d){if(!c.disabled){g=
-false;i=d.pageX;j=d.pageY}}).bind("mouseup.button",function(d){if(!c.disabled)if(i!==d.pageX||j!==d.pageY)g=true})}if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled||g)return false;b(this).toggleClass("ui-state-active");a.buttonElement.attr("aria-pressed",a.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled||g)return false;b(this).addClass("ui-state-active");a.buttonElement.attr("aria-pressed","true");
-var d=a.element[0];k(d).not(d).map(function(){return b(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;b(this).addClass("ui-state-active");h=this;b(document).one("mouseup",function(){h=null})}).bind("mouseup.button",function(){if(c.disabled)return false;b(this).removeClass("ui-state-active")}).bind("keydown.button",function(d){if(c.disabled)return false;if(d.keyCode==b.ui.keyCode.SPACE||
-d.keyCode==b.ui.keyCode.ENTER)b(this).addClass("ui-state-active")}).bind("keyup.button",function(){b(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(d){d.keyCode===b.ui.keyCode.SPACE&&b(this).click()})}this._setOption("disabled",c.disabled);this._resetButton()},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type===
-"radio"){var a=this.element.parents().filter(":last"),c="label[for='"+this.element.attr("id")+"']";this.buttonElement=a.find(c);if(!this.buttonElement.length){a=a.length?a.siblings():this.element.siblings();this.buttonElement=a.filter(c);if(!this.buttonElement.length)this.buttonElement=a.find(c)}this.element.addClass("ui-helper-hidden-accessible");(a=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",a)}else this.buttonElement=this.element},
-widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||this.buttonElement.removeAttr("title");
-b.Widget.prototype.destroy.call(this)},_setOption:function(a,c){b.Widget.prototype._setOption.apply(this,arguments);if(a==="disabled")c?this.element.propAttr("disabled",true):this.element.propAttr("disabled",false);else this._resetButton()},refresh:function(){var a=this.element.is(":disabled");a!==this.options.disabled&&this._setOption("disabled",a);if(this.type==="radio")k(this.element[0]).each(function(){b(this).is(":checked")?b(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
-"true"):b(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false")},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var a=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
-c=b("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(a.empty()).text(),e=this.options.icons,f=e.primary&&e.secondary,d=[];if(e.primary||e.secondary){if(this.options.text)d.push("ui-button-text-icon"+(f?"s":e.primary?"-primary":"-secondary"));e.primary&&a.prepend("<span class='ui-button-icon-primary ui-icon "+e.primary+"'></span>");e.secondary&&a.append("<span class='ui-button-icon-secondary ui-icon "+e.secondary+"'></span>");if(!this.options.text){d.push(f?"ui-button-icons-only":
-"ui-button-icon-only");this.hasTitle||a.attr("title",c)}}else d.push("ui-button-text-only");a.addClass(d.join(" "))}}});b.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(a,c){a==="disabled"&&this.buttons.button("option",a,c);b.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var a=this.element.css("direction")===
-"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(a?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(a?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return b(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
-b.Widget.prototype.destroy.call(this)}})})(jQuery);
-;/*
- * jQuery UI Dialog 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Dialog
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *  jquery.ui.button.js
- *	jquery.ui.draggable.js
- *	jquery.ui.mouse.js
- *	jquery.ui.position.js
- *	jquery.ui.resizable.js
- */
-(function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
-position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
-b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&!i.isDefaultPrevented()&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),
-h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",
-e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
-a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==
-b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.scrollTop(),scrollLeft:d.element.scrollLeft()};c.ui.dialog.maxZ+=1;
-d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===
-f[0]&&e.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,
-function(){return!(d=true)});if(d){c.each(a,function(f,h){h=c.isFunction(h)?{click:h,text:f}:h;var i=c('<button type="button"></button>').click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.each(h,function(j,k){if(j!=="click")j in o?i[j](k):i.attr(j,k)});c.fn.button&&i.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
-handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,
-originalSize:f.originalSize,position:f.position,size:f.size}}a=a===l?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",
-f,b(h))},stop:function(f,h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):
-[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);
-if(g in m)e=true;if(g in n)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):
-e.removeClass("ui-dialog-disabled");break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=
-this.options,b,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-
-b,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.16",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),
-create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&!d.isDefaultPrevented()&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||
-c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&
-c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+
-"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
-;/*
- * jQuery UI Slider 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Slider
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
-(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var a=this,b=this.options,c=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f=b.values&&b.values.length||1,e=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
-this.orientation+" ui-widget ui-widget-content ui-corner-all"+(b.disabled?" ui-slider-disabled ui-disabled":""));this.range=d([]);if(b.range){if(b.range===true){if(!b.values)b.values=[this._valueMin(),this._valueMin()];if(b.values.length&&b.values.length!==2)b.values=[b.values[0],b.values[0]]}this.range=d("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(b.range==="min"||b.range==="max"?" ui-slider-range-"+b.range:""))}for(var j=c.length;j<f;j+=1)e.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
-this.handles=c.add(d(e.join("")).appendTo(a.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(g){g.preventDefault()}).hover(function(){b.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(b.disabled)d(this).blur();else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(g){d(this).data("index.ui-slider-handle",
-g)});this.handles.keydown(function(g){var k=true,l=d(this).data("index.ui-slider-handle"),i,h,m;if(!a.options.disabled){switch(g.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:k=false;if(!a._keySliding){a._keySliding=true;d(this).addClass("ui-state-active");i=a._start(g,l);if(i===false)return}break}m=a.options.step;i=a.options.values&&a.options.values.length?
-(h=a.values(l)):(h=a.value());switch(g.keyCode){case d.ui.keyCode.HOME:h=a._valueMin();break;case d.ui.keyCode.END:h=a._valueMax();break;case d.ui.keyCode.PAGE_UP:h=a._trimAlignValue(i+(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:h=a._trimAlignValue(i-(a._valueMax()-a._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(i===a._valueMax())return;h=a._trimAlignValue(i+m);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(i===a._valueMin())return;h=a._trimAlignValue(i-
-m);break}a._slide(g,l,h);return k}}).keyup(function(g){var k=d(this).data("index.ui-slider-handle");if(a._keySliding){a._keySliding=false;a._stop(g,k);a._change(g,k);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
-return this},_mouseCapture:function(a){var b=this.options,c,f,e,j,g;if(b.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:a.pageX,y:a.pageY});f=this._valueMax()-this._valueMin()+1;j=this;this.handles.each(function(k){var l=Math.abs(c-j.values(k));if(f>l){f=l;e=d(this);g=k}});if(b.range===true&&this.values(1)===b.min){g+=1;e=d(this.handles[g])}if(this._start(a,g)===false)return false;
-this._mouseSliding=true;j._handleIndex=g;e.addClass("ui-state-active").focus();b=e.offset();this._clickOffset=!d(a.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:a.pageX-b.left-e.width()/2,top:a.pageY-b.top-e.height()/2-(parseInt(e.css("borderTopWidth"),10)||0)-(parseInt(e.css("borderBottomWidth"),10)||0)+(parseInt(e.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(a,g,c);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(a){var b=
-this._normValueFromMouse({x:a.pageX,y:a.pageY});this._slide(a,this._handleIndex,b);return false},_mouseStop:function(a){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(a,this._handleIndex);this._change(a,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b;if(this.orientation==="horizontal"){b=
-this.elementSize.width;a=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{b=this.elementSize.height;a=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}b=a/b;if(b>1)b=1;if(b<0)b=0;if(this.orientation==="vertical")b=1-b;a=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+b*a)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);
-c.values=this.values()}return this._trigger("start",a,c)},_slide:function(a,b,c){var f;if(this.options.values&&this.options.values.length){f=this.values(b?0:1);if(this.options.values.length===2&&this.options.range===true&&(b===0&&c>f||b===1&&c<f))c=f;if(c!==this.values(b)){f=this.values();f[b]=c;a=this._trigger("slide",a,{handle:this.handles[b],value:c,values:f});this.values(b?0:1);a!==false&&this.values(b,c,true)}}else if(c!==this.value()){a=this._trigger("slide",a,{handle:this.handles[b],value:c});
-a!==false&&this.value(c)}},_stop:function(a,b){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("stop",a,c)},_change:function(a,b){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[b],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(b);c.values=this.values()}this._trigger("change",a,c)}},value:function(a){if(arguments.length){this.options.value=
-this._trimAlignValue(a);this._refreshValue();this._change(null,0)}else return this._value()},values:function(a,b){var c,f,e;if(arguments.length>1){this.options.values[a]=this._trimAlignValue(b);this._refreshValue();this._change(null,a)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;f=arguments[0];for(e=0;e<c.length;e+=1){c[e]=this._trimAlignValue(f[e]);this._change(null,e)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(a):
-this.value();else return this._values()},_setOption:function(a,b){var c,f=0;if(d.isArray(this.options.values))f=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(a){case "disabled":if(b){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
-this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var a=this.options.value;return a=this._trimAlignValue(a)},_values:function(a){var b,c;if(arguments.length){b=this.options.values[a];
-return b=this._trimAlignValue(b)}else{b=this.options.values.slice();for(c=0;c<b.length;c+=1)b[c]=this._trimAlignValue(b[c]);return b}},_trimAlignValue:function(a){if(a<=this._valueMin())return this._valueMin();if(a>=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b;a=a-c;if(Math.abs(c)*2>=b)a+=c>0?b:-b;return parseFloat(a.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var a=
-this.options.range,b=this.options,c=this,f=!this._animateOff?b.animate:false,e,j={},g,k,l,i;if(this.options.values&&this.options.values.length)this.handles.each(function(h){e=(c.values(h)-c._valueMin())/(c._valueMax()-c._valueMin())*100;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";d(this).stop(1,1)[f?"animate":"css"](j,b.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(h===0)c.range.stop(1,1)[f?"animate":"css"]({left:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({width:e-
-g+"%"},{queue:false,duration:b.animate})}else{if(h===0)c.range.stop(1,1)[f?"animate":"css"]({bottom:e+"%"},b.animate);if(h===1)c.range[f?"animate":"css"]({height:e-g+"%"},{queue:false,duration:b.animate})}g=e});else{k=this.value();l=this._valueMin();i=this._valueMax();e=i!==l?(k-l)/(i-l)*100:0;j[c.orientation==="horizontal"?"left":"bottom"]=e+"%";this.handle.stop(1,1)[f?"animate":"css"](j,b.animate);if(a==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[f?"animate":"css"]({width:e+"%"},
-b.animate);if(a==="max"&&this.orientation==="horizontal")this.range[f?"animate":"css"]({width:100-e+"%"},{queue:false,duration:b.animate});if(a==="min"&&this.orientation==="vertical")this.range.stop(1,1)[f?"animate":"css"]({height:e+"%"},b.animate);if(a==="max"&&this.orientation==="vertical")this.range[f?"animate":"css"]({height:100-e+"%"},{queue:false,duration:b.animate})}}});d.extend(d.ui.slider,{version:"1.8.16"})})(jQuery);
-;/*
- * jQuery UI Tabs 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
-(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
-e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
-d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
-(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
-this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
-this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
-if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
-this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
-g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
-function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
-this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
--1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
-d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
-d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
-e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
-j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
-if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
-this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
-load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
-"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
-url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.16"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
-a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
-;/*
- * jQuery UI Datepicker 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- *	jquery.ui.core.js
- */
-(function(d,C){function M(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
-"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
-"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
-minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=N(d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function N(a){return a.bind("mouseout",
-function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");b.length&&b.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(b){b=d(b.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(d.datepicker._isDisabledDatepicker(J.inline?a.parent()[0]:J.input[0])||!b.length)){b.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
-b.addClass("ui-state-hover");b.hasClass("ui-datepicker-prev")&&b.addClass("ui-datepicker-prev-hover");b.hasClass("ui-datepicker-next")&&b.addClass("ui-datepicker-next-hover")}})}function H(a,b){d.extend(a,b);for(var c in b)if(b[c]==null||b[c]==C)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.16"}});var B=(new Date).getTime(),J;d.extend(M.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},
-setDefaults:function(a){H(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,
-"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:N(d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
-function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b);b.settings.disabled&&this._disableDatepicker(a)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c==
-"focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():
-d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,
-b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),true);this._updateDatepicker(b);this._updateAlternate(b);b.settings.disabled&&this._disableDatepicker(a);b.dpDiv.css("display","block")}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=
-1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}H(a.settings,e||{});b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
-2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=
-d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=
-a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().removeClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,
-"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span"){b=b.children("."+this._inlineClass);b.children().addClass("ui-state-disabled");b.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=d.map(this._disabledInputs,function(f){return f==
-a?null:f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?
-d.extend({},e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");H(e.settings,f);if(i!==null&&f.dateFormat!==C&&f.minDate===C)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==C&&f.maxDate===C)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDate(e,h);this._updateAlternate(e);
-this._updateDatepicker(e)}},_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");
-b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]&&d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]);if(a=d.datepicker._get(b,"onSelect")){c=d.datepicker._formatDate(b);a.apply(b.input?b.input[0]:null,[c,b])}else d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,
-a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=
-a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,
-"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,+7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==C?a.keyCode:a.charCode);
-return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",
-a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);if(d.datepicker._curInst&&d.datepicker._curInst!=b){d.datepicker._datepickerShowing&&d.datepicker._triggerOnClose(d.datepicker._curInst);d.datepicker._curInst.dpDiv.stop(true,true)}var c=d.datepicker._get(b,"beforeShow");c=c?c.apply(a,[a,b]):{};if(c!==false){H(b.settings,c);b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value=
-"";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);
-c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");var f=d.datepicker._get(b,"duration"),h=function(){var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.datepicker._datepickerShowing=
-true;d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=b}}}},_updateDatepicker:function(a){this.maxRows=4;var b=d.datepicker._getBorders(a.dpDiv);J=a;a.dpDiv.empty().append(this._generateHTML(a));var c=a.dpDiv.find("iframe.ui-datepicker-cover");c.length&&c.css({left:-b[0],top:-b[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});
-a.dpDiv.find("."+this._dayOverClass+" a").mouseover();b=this._getNumberOfMonths(a);c=b[1];a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");c>1&&a.dpDiv.addClass("ui-datepicker-multi-"+c).css("width",17*c+"em");a.dpDiv[(b[0]!=1||b[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&
-!a.input.is(":disabled")&&a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var e=a.yearshtml;setTimeout(function(){e===a.yearshtml&&a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);e=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),
-h=a.input?a.input.outerWidth():0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=
-this._get(this._getInst(a),"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_triggerOnClose:function(a){var b=this._get(a,"onClose");if(b)b.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a])},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);
-this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?"fadeOut":"hide"](a?c:null,e);a||e();d.datepicker._triggerOnClose(b);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
-_checkExternalClick:function(a){if(d.datepicker._curInst){a=d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):
-0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e["selected"+(c=="M"?
-"Month":"Year")]=e["draw"+(c=="M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);
-this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");
-if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?
-b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=A+1<a.length&&a.charAt(A+1)==p)&&A++;return p},m=function(p){var D=
-o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&D?4:p=="o"?3:2)+"}");p=b.substring(q).match(p);if(!p)throw"Missing number at position "+q;q+=p[0].length;return parseInt(p[0],10)},n=function(p,D,K){p=d.map(o(p)?K:D,function(w,x){return[[x,w]]}).sort(function(w,x){return-(w[1].length-x[1].length)});var E=-1;d.each(p,function(w,x){w=x[1];if(b.substr(q,w.length).toLowerCase()==w.toLowerCase()){E=x[0];q+=w.length;return false}});if(E!=-1)return E+1;else throw"Unknown name at position "+q;},s=
-function(){if(b.charAt(q)!=a.charAt(A))throw"Unexpected literal at position "+q;q++},q=0,A=0;A<a.length;A++)if(k)if(a.charAt(A)=="'"&&!o("'"))k=false;else s();else switch(a.charAt(A)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var v=new Date(m("@"));c=v.getFullYear();j=v.getMonth()+1;l=v.getDate();break;case "!":v=new Date((m("!")-this._ticksTo1970)/1E4);c=v.getFullYear();j=v.getMonth()+
-1;l=v.getDate();break;case "'":if(o("'"))s();else k=true;break;default:s()}if(q<b.length)throw"Extra/unparsed characters found in date: "+b.substring(q);if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}v=this._daylightSavingAdjust(new Date(c,j-1,l));if(v.getFullYear()!=c||v.getMonth()+1!=j||v.getDate()!=l)throw"Invalid date";return v},ATOM:"yy-mm-dd",
-COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:
-null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,s){return i(o)?s[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",Math.round(((new Date(b.getFullYear(),b.getMonth(),b.getDate())).getTime()-
-(new Date(b.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=
-0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+="0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==C?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);
-var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;
-i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=
-Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>
-12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&
-a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?
-new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));
-n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var s=this._get(a,"nextText");s=!h?s:this.formatDate(s,this._daylightSavingAdjust(new Date(m,
-g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+B+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+s+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+s+"</span></a>";j=this._get(a,"currentText");s=this._get(a,"gotoCurrent")&&
-a.currentDay?u:b;j=!h?j:this.formatDate(j,s,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+B+'.datepicker._hideDatepicker();">'+this._get(a,"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,s)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
-B+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");s=this._get(a,"dayNames");this._get(a,"dayNamesShort");var q=this._get(a,"dayNamesMin"),A=this._get(a,"monthNames"),v=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),D=this._get(a,"showOtherMonths"),K=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var E=this._getDefaultDate(a),w="",x=0;x<i[0];x++){var O=
-"";this.maxRows=4;for(var G=0;G<i[1];G++){var P=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",y="";if(l){y+='<div class="ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-1:y+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:y+=" ui-datepicker-group-middle";t="";break}y+='">'}y+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&
-x==0?c?f:n:"")+(/all|right/.test(t)&&x==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,x>0||G>0,A,v)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var z=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var r=(t+h)%7;z+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+s[r]+'">'+q[r]+"</span></th>"}y+=z+"</tr></thead><tbody>";z=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,
-z);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;z=Math.ceil((t+z)/7);this.maxRows=z=l?this.maxRows>z?this.maxRows:z:z;r=this._daylightSavingAdjust(new Date(m,g,1-t));for(var Q=0;Q<z;Q++){y+="<tr>";var R=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(r)+"</td>";for(t=0;t<7;t++){var I=p?p.apply(a.input?a.input[0]:null,[r]):[true,""],F=r.getMonth()!=g,L=F&&!K||!I[0]||k&&r<k||o&&r>o;R+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(r.getTime()==
-P.getTime()&&g==a.selectedMonth&&a._keyEvent||E.getTime()==r.getTime()&&E.getTime()==P.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!D?"":" "+I[1]+(r.getTime()==u.getTime()?" "+this._currentClass:"")+(r.getTime()==b.getTime()?" ui-datepicker-today":""))+'"'+((!F||D)&&I[2]?' title="'+I[2]+'"':"")+(L?"":' onclick="DP_jQuery_'+B+".datepicker._selectDay('#"+a.id+"',"+r.getMonth()+","+r.getFullYear()+', this);return false;"')+">"+(F&&!D?"&#xa0;":L?'<span class="ui-state-default">'+
-r.getDate()+"</span>":'<a class="ui-state-default'+(r.getTime()==b.getTime()?" ui-state-highlight":"")+(r.getTime()==u.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+'" href="#">'+r.getDate()+"</a>")+"</td>";r.setDate(r.getDate()+1);r=this._daylightSavingAdjust(r)}y+=R+"</tr>"}g++;if(g>11){g=0;m++}y+="</tbody></table>"+(l?"</div>"+(i[0]>0&&G==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");O+=y}w+=O}w+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
-"");a._keyEvent=false;return w},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" >";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&
-(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&l)?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var s=(new Date).getFullYear();i=function(q){q=q.match(/c[+-].*/)?c+parseInt(q.substring(1),10):q.match(/[+-].*/)?s+parseInt(q,10):parseInt(q,10);return isNaN(q)?s:q};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,
-e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+B+".datepicker._selectMonthYear('#"+a.id+"', this, 'Y');\" >";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";k+=a.yearshtml;a.yearshtml=null}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=a.drawYear+(c=="Y"?b:0),f=a.drawMonth+
-(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");if(b)b.apply(a.input?
-a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);c=this._daylightSavingAdjust(new Date(c,
-e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,
-"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=function(a){if(!this.length)return this;
-if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));return this.each(function(){typeof a==
-"string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new M;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.16";window["DP_jQuery_"+B]=d})(jQuery);
-;/*
- * jQuery UI Progressbar 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Progressbar
- *
- * Depends:
- *   jquery.ui.core.js
- *   jquery.ui.widget.js
- */
-(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
-this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*
-this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.16"})})(jQuery);
-;/*
- * jQuery UI Effects 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/
- */
-jQuery.effects||function(f,j){function m(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
-16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return n.transparent;return n[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return m(b)}function o(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
-a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function p(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
-a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function l(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
-"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=m(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var n={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
-0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
-211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},q=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
-d){if(f.isFunction(b)){d=b;b=null}return this.queue(function(){var e=f(this),g=e.attr("style")||" ",h=p(o.call(this)),r,v=e.attr("class");f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});r=p(o.call(this));e.attr("class",v);e.animate(u(h,r),{queue:false,duration:a,easing:b,complete:function(){f.each(q,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments);f.dequeue(this)}})})};
-f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,a):f.effects.animateClass.apply(this,
-[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.16",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,a){var b;switch(c[0]){case "top":b=
-0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),
-d=document.activeElement;c.wrap(b);if(c[0]===d||f.contains(c[0],d))f(d).focus();b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(e,g){a[g]=c.css(g);if(isNaN(parseInt(a[g],10)))a[g]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){var a,b=document.activeElement;
-if(c.parent().is(".ui-effects-wrapper")){a=c.parent().replaceWith(c);if(c[0]===b||f.contains(c[0],b))f(b).focus();return a}return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});
-return d.call(this,b)},_show:f.fn.show,show:function(c){if(l(c))return this._show.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(l(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(l(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,
-arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/
-2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,
-d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,
-a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,
-d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=
-0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;
-if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,
-a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
-;/*
- * jQuery UI Effects Blind 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
-g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
-;/*
- * jQuery UI Effects Bounce 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
-3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
-b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Clip 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
-c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Drop 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
-"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Explode 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
-0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
-e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
-;/*
- * jQuery UI Effects Fade 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fade
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Fold 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
-10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
-;/*
- * jQuery UI Effects Highlight 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
-this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Pulsate 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
-a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Scale 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
-b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
-1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
-p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};
-if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);
-a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);
-child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,
-n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Shake 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
-(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
-;/*
- * jQuery UI Effects Slide 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
-var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
-;/*
- * jQuery UI Effects Transfer 1.8.16
- *
- * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- *	jquery.effects.core.js
- */
-(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
-b.dequeue()})})}})(jQuery);
-;
\ No newline at end of file
diff --git a/core/js/js.js b/core/js/js.js
index 95889ac8a277147954e8744ee551a93ff72e0b71..01e47edf2683876b0d1d37d5a0f99a39f96620e7 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -37,14 +37,14 @@ function t(app,text, vars){
 			t.cache[app] = [];
 		}
 	}
-	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;
-			}
-		);
-	}
+	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;
+            }
+        );
+    };
 	if( typeof( t.cache[app][text] ) !== 'undefined' ){
 		if(typeof vars === 'object') {
 			return _build(t.cache[app][text], vars);
@@ -88,7 +88,7 @@ var OC={
 	PERMISSION_DELETE:8,
 	PERMISSION_SHARE:16,
 	webroot:oc_webroot,
-	appswebroots:oc_appswebroots,
+	appswebroots:(typeof oc_appswebroots !== 'undefined') ? oc_appswebroots:false,
 	currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,
 	coreApps:['', 'admin','log','search','settings','core','3rdparty'],
 	/**
@@ -100,6 +100,27 @@ var OC={
 	linkTo:function(app,file){
 		return OC.filePath(app,'',file);
 	},
+	/**
+	 * Creates an url for remote use
+	 * @param string $service id
+	 * @return string the url
+	 *
+	 * Returns a url to the given service.
+	 */
+	linkToRemoteBase:function(service) {
+		return OC.webroot + '/remote.php/' + service;
+	},
+	/**
+	 * @brief Creates an absolute url for remote use
+	 * @param string $service id
+	 * @param bool $add_slash
+	 * @return string the url
+	 *
+	 * Returns a absolute url to the given service.
+	 */
+	linkToRemote:function(service) {
+		return window.location.protocol + '//' + window.location.host + OC.linkToRemoteBase(service);
+	},
 	/**
 	 * get the absolute url for a file in an app
 	 * @param app the id of the app
@@ -247,7 +268,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')) {
@@ -289,6 +310,41 @@ OC.search.lastResults={};
 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");
+    },
+	isHidden: function() {
+		return ($("#notification").text() === '');
+	}
+};
+
 OC.Breadcrumb={
 	container:null,
 	crumbs:[],
@@ -504,6 +560,7 @@ function fillHeight(selector) {
 	if(selector.outerHeight() > selector.height()){
 		selector.css('height', height-(selector.outerHeight()-selector.height()) + 'px');
 	}
+	console.warn("This function is deprecated! Use CSS instead");
 }
 
 /**
@@ -519,17 +576,11 @@ function fillWindow(selector) {
 	if(selector.outerWidth() > selector.width()){
 		selector.css('width', width-(selector.outerWidth()-selector.width()) + 'px');
 	}
+	console.warn("This function is deprecated! Use CSS instead");
 }
 
 $(document).ready(function(){
 
-	$(window).resize(function () {
-		fillHeight($('#leftcontent'));
-		fillWindow($('#content'));
-		fillWindow($('#rightcontent'));
-	});
-	$(window).trigger('resize');
-
 	if(!SVGSupport()){ //replace all svg images with png images for browser that dont support svg
 		replaceSVG();
 	}else{
diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4cf286b8aa9e0c4ae2f310657475dd3b03d5d6d
--- /dev/null
+++ b/core/js/oc-requesttoken.js
@@ -0,0 +1,3 @@
+$(document).bind('ajaxSend', function(elm, xhr, s) {
+	xhr.setRequestHeader('requesttoken', oc_requesttoken);
+});
\ No newline at end of file
diff --git a/core/js/setup.js b/core/js/setup.js
index 39fcf4a2715cfa6ac03990d3265c9d0fb7a1f5dc..9aded6591ca0b23aa434b4b6b9fb556f18bd0b35 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -52,11 +52,12 @@ $(document).ready(function() {
 		// Save form parameters
 		var post = $(this).serializeArray();
 
+		// FIXME: This lines are breaking the installation
 		// Disable inputs
-		$(':submit', this).attr('disabled','disabled').val('Finishing â€¦');
-		$('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
-		$('#selectDbType').button('disable');
-		$('label.ui-button', this).addClass('ui-state-disabled').attr('aria-disabled', 'true').button('disable');
+		// $(':submit', this).attr('disabled','disabled').val('Finishing â€¦');
+		// $('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
+		// $('#selectDbType').button('disable');
+		// $('label.ui-button', this).addClass('ui-state-disabled').attr('aria-disabled', 'true').button('disable');
 
 		// Create the form
 		var form = $('<form>');
diff --git a/core/js/share.js b/core/js/share.js
index bb3ec010ff51c13ccaac9e321fd989e9e42e705f..0c45765bd8b3b09c4edeadbb9ae30431267b0893 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -23,7 +23,10 @@ OC.Share={
 					} else {
 						var file = $('tr').filterAttr('data-file', OC.basename(item));
 						if (file.length > 0) {
-							$(file).find('.fileactions .action').filterAttr('data-action', 'Share').find('img').attr('src', image);
+							var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
+							action.find('img').attr('src', image);
+							action.addClass('permanent');
+							action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
 						}
 						var dir = $('#dir').val();
 						if (dir.length > 1) {
@@ -32,9 +35,12 @@ OC.Share={
 							// Search for possible parent folders that are shared
 							while (path != last) {
 								if (path == item) {
-									var img = $('.fileactions .action').filterAttr('data-action', 'Share').find('img');
+									var action = $('.fileactions .action').filterAttr('data-action', 'Share');
+									var img = action.find('img');
 									if (img.attr('src') != OC.imagePath('core', 'actions/public')) {
 										img.attr('src', image);
+										action.addClass('permanent');
+										action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
 									}
 								}
 								last = path;
@@ -48,7 +54,8 @@ OC.Share={
 	},
 	updateIcon:function(itemType, itemSource) {
 		if (itemType == 'file' || itemType == 'folder') {
-			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+			var file = $('tr').filterAttr('data-id', String(itemSource));
+			var filename = file.data('file');
 			if ($('#dir').val() == '/') {
 				itemSource = $('#dir').val() + filename;
 			} else {
@@ -75,6 +82,16 @@ OC.Share={
 		});
 		if (itemType != 'file' && itemType != 'folder') {
 			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+image+') no-repeat center');
+		} else {
+			var action = $(file).find('.fileactions .action').filterAttr('data-action', 'Share');
+			action.find('img').attr('src', image);
+			if (shares) {
+				action.addClass('permanent');
+				action.html(action.html().replace(t('core', 'Share'), t('core', 'Shared')));
+			} else {
+				action.removeClass('permanent');
+				action.html(action.html().replace(t('core', 'Shared'), t('core', 'Share')));
+			}
 		}
 		if (shares) {
 			OC.Share.statuses[itemSource] = link;
@@ -148,9 +165,9 @@ OC.Share={
 		var html = '<div id="dropdown" class="drop" data-item-type="'+itemType+'" data-item-source="'+itemSource+'">';
 		if (data !== false && data.reshare !== false && data.reshare.uid_owner !== undefined) {
 			if (data.reshare.share_type == OC.Share.SHARE_TYPE_GROUP) {
-				html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.uid_owner})+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you and the group {group} by {owner}', {group: data.reshare.share_with, owner: data.reshare.displayname_owner})+'</span>';
 			} else {
-				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: data.reshare.uid_owner})+'</span>';
+				html += '<span class="reshare">'+t('core', 'Shared with you by {owner}', {owner: data.reshare.displayname_owner})+'</span>';
 			}
 			html += '<br />';
 		}
@@ -186,9 +203,9 @@ OC.Share={
 						OC.Share.showLink(share.token, share.share_with, itemSource);
 					} else {
 						if (share.collection) {
-							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection);
+							OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname, share.permissions, possiblePermissions, share.collection);
 						} else {
-							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, false);
+							OC.Share.addShareWith(share.share_type, share.share_with, share.share_with_displayname,  share.permissions, possiblePermissions, false);
 						}
 					}
 					if (share.expiration != null) {
@@ -228,7 +245,7 @@ OC.Share={
 				// Default permissions are Read and Share
 				var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE;
 				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
-					OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
+					OC.Share.addShareWith(shareType, shareWith, selected.item.label, permissions, possiblePermissions);
 					$('#shareWith').val('');
 					OC.Share.updateIcon(itemType, itemSource);
 				});
@@ -257,7 +274,7 @@ OC.Share={
 			}
 		});
 	},
-	addShareWith:function(shareType, shareWith, permissions, possiblePermissions, collection) {
+	addShareWith:function(shareType, shareWith, shareWithDisplayName, permissions, possiblePermissions, collection) {
 		if (!OC.Share.itemShares[shareType]) {
 			OC.Share.itemShares[shareType] = [];
 		}
@@ -272,7 +289,7 @@ OC.Share={
 			if (collectionList.length > 0) {
 				$(collectionList).append(', '+shareWith);
 			} else {
-				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWith})+'</li>';
+				var html = '<li style="clear: both;" data-collection="'+item+'">'+t('core', 'Shared in {item} with {user}', {'item': item, user: shareWithDisplayName})+'</li>';
 				$('#shareWithList').prepend(html);
 			}
 		} else {
@@ -295,9 +312,9 @@ OC.Share={
 			var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'" title="' + 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 += shareWith.substr(0,11) + '...';
+				html += shareWithDisplayName.substr(0,11) + '...';
 			}else{
-				html += shareWith;
+				html += shareWithDisplayName;
 			}
 			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
 				if (editChecked == '') {
diff --git a/core/js/update.js b/core/js/update.js
new file mode 100644
index 0000000000000000000000000000000000000000..8ab02bbf9350c3bdeb594a49561c6ae6499b34c2
--- /dev/null
+++ b/core/js/update.js
@@ -0,0 +1,23 @@
+$(document).ready(function () {
+	var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
+	updateEventSource.listen('success', function(message) {
+		$('<span>').append(message).append('<br />').appendTo($('.update'));
+	});
+	updateEventSource.listen('error', function(message) {
+		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+	});
+	updateEventSource.listen('failure', function(message) {
+		$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
+		$('<span>')
+		.addClass('error bold')
+		.append('<br />')
+		.append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
+		.appendTo($('.update'));
+	});
+	updateEventSource.listen('done', function(message) {
+		$('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update'));
+		setTimeout(function () {
+			window.location.href = OC.webroot;
+		}, 3000);
+	});
+});
\ No newline at end of file
diff --git a/core/js/visitortimezone.js b/core/js/visitortimezone.js
new file mode 100644
index 0000000000000000000000000000000000000000..58a1e9ea355aa4ab76bd59b96094b1fdc1220f60
--- /dev/null
+++ b/core/js/visitortimezone.js
@@ -0,0 +1,4 @@
+$(document).ready(function () {
+		var visitortimezone = (-new Date().getTimezoneOffset() / 60);
+		$('#timezone-offset').val(visitortimezone);
+});
\ No newline at end of file
diff --git a/core/l10n/ar.php b/core/l10n/ar.php
index 221ea8aebb19dcccb7580d66ed17d4b880d91bf4..495bfbd0eac91331fbb1e6d71580111e52ef4fbf 100644
--- a/core/l10n/ar.php
+++ b/core/l10n/ar.php
@@ -2,6 +2,25 @@
 "No category to add?" => "Ø£Ù„Ø§ ØªÙˆØ¬Ø¯ ÙØ¦Ø© Ù„Ù„Ø¥Ø¶Ø§ÙØ©ØŸ",
 "This category already exists: " => "Ù‡Ø°Ù‡ Ø§Ù„ÙØ¦Ø© Ù…ÙˆØ¬ÙˆØ¯Ø© Ù…Ø³Ø¨Ù‚Ø§Ù‹",
 "No categories selected for deletion." => "Ù„Ù… ÙŠØªÙ… Ø§Ø®ØªÙŠØ§Ø± ÙØ¦Ø© Ù„Ù„ØØ°Ù",
+"Sunday" => "Ø§Ù„Ø§ØØ¯",
+"Monday" => "Ø§Ù„Ø£Ø«Ù†ÙŠÙ†",
+"Tuesday" => "Ø§Ù„Ø«Ù„Ø§Ø«Ø§Ø¡",
+"Wednesday" => "Ø§Ù„Ø§Ø±Ø¨Ø¹Ø§Ø¡",
+"Thursday" => "Ø§Ù„Ø®Ù…ÙŠØ³",
+"Friday" => "Ø§Ù„Ø¬Ù…Ø¹Ù‡",
+"Saturday" => "Ø§Ù„Ø³Ø¨Øª",
+"January" => "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ",
+"February" => "Ø´Ø¨Ø§Ø·",
+"March" => "Ø¢Ø°Ø§Ø±",
+"April" => "Ù†ÙŠØ³Ø§Ù†",
+"May" => "Ø£ÙŠØ§Ø±",
+"June" => "ØØ²ÙŠØ±Ø§Ù†",
+"July" => "ØªÙ…ÙˆØ²",
+"August" => "Ø¢Ø¨",
+"September" => "Ø£ÙŠÙ„ÙˆÙ„",
+"October" => "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø§ÙˆÙ„",
+"November" => "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ",
+"December" => "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø§ÙˆÙ„",
 "Settings" => "ØªØ¹Ø¯ÙŠÙ„Ø§Øª",
 "seconds ago" => "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ",
 "1 minute ago" => "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©",
@@ -71,25 +90,6 @@
 "Database tablespace" => "Ù…Ø³Ø§ØØ© Ø¬Ø¯ÙˆÙ„ Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª",
 "Database host" => "Ø®Ø§Ø¯Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª",
 "Finish setup" => "Ø§Ù†Ù‡Ø§Ø¡ Ø§Ù„ØªØ¹Ø¯ÙŠÙ„Ø§Øª",
-"Sunday" => "Ø§Ù„Ø§ØØ¯",
-"Monday" => "Ø§Ù„Ø£Ø«Ù†ÙŠÙ†",
-"Tuesday" => "Ø§Ù„Ø«Ù„Ø§Ø«Ø§Ø¡",
-"Wednesday" => "Ø§Ù„Ø§Ø±Ø¨Ø¹Ø§Ø¡",
-"Thursday" => "Ø§Ù„Ø®Ù…ÙŠØ³",
-"Friday" => "Ø§Ù„Ø¬Ù…Ø¹Ù‡",
-"Saturday" => "Ø§Ù„Ø³Ø¨Øª",
-"January" => "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ",
-"February" => "Ø´Ø¨Ø§Ø·",
-"March" => "Ø¢Ø°Ø§Ø±",
-"April" => "Ù†ÙŠØ³Ø§Ù†",
-"May" => "Ø£ÙŠØ§Ø±",
-"June" => "ØØ²ÙŠØ±Ø§Ù†",
-"July" => "ØªÙ…ÙˆØ²",
-"August" => "Ø¢Ø¨",
-"September" => "Ø£ÙŠÙ„ÙˆÙ„",
-"October" => "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø§ÙˆÙ„",
-"November" => "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ",
-"December" => "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø§ÙˆÙ„",
 "web services under your control" => "Ø®Ø¯Ù…Ø§Øª Ø§Ù„ÙˆØ¨ ØªØØª ØªØµØ±ÙÙƒ",
 "Log out" => "Ø§Ù„Ø®Ø±ÙˆØ¬",
 "Automatic logon rejected!" => "ØªÙ… Ø±ÙØ¶ ØªØ³Ø¬ÙŠÙ„ Ø§Ù„Ø¯Ø®ÙˆÙ„ Ø§Ù„ØªÙ„Ù‚Ø§Ø¦ÙŠ!",
@@ -99,8 +99,5 @@
 "remember" => "ØªØ°ÙƒØ±",
 "Log in" => "Ø£Ø¯Ø®Ù„",
 "prev" => "Ø§Ù„Ø³Ø§Ø¨Ù‚",
-"next" => "Ø§Ù„ØªØ§Ù„ÙŠ",
-"Security Warning!" => "ØªØØ°ÙŠØ± Ø£Ù…Ø§Ù†!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±. <br/>Ù…Ù† Ø§Ù„Ù…Ù…ÙƒÙ† Ø£ØÙŠØ§Ù†Ø§Ù‹ Ø£Ù† Ù†Ø·Ù„Ø¨ Ù…Ù†Ùƒ Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¯Ø®Ø§Ù„ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± Ù…Ø±Ø© Ø£Ø®Ø±Ù‰.",
-"Verify" => "ØªØÙ‚ÙŠÙ‚"
+"next" => "Ø§Ù„ØªØ§Ù„ÙŠ"
 );
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index a7cba523be2a48dbcd8ddb5318a7ba703ba73221..9a2716277a3d3783962cb3733ac22810fe08152c 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -8,6 +8,7 @@
 "last month" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†",
 "last year" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°",
 "years ago" => "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸",
+"Error" => "Ð“Ñ€ÐµÑˆÐºÐ°",
 "Password" => "ÐŸÐ°Ñ€Ð¾Ð»Ð°",
 "Personal" => "Ð›Ð¸Ñ‡Ð½Ð¸",
 "Users" => "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ð¸",
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
index 60e23e4c16cfb7d87af9baaf25b29d07448a545d..2f13a49794874710e93c0d6f66d16066056847be 100644
--- a/core/l10n/bn_BD.php
+++ b/core/l10n/bn_BD.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "à¦ªà§à¦°à¦¿à§Ÿà¦¤à§‡ %s à¦¯à§‹à¦— à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡à¥¤",
 "No categories selected for deletion." => "à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¾à¦° à¦œà¦¨à§à¦¯ à¦•à§‹à¦¨ à¦•à§à¦¯à¦¾à¦Ÿà§‡à¦—à¦°à¦¿ à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿ à¦¨à¦¿ à¥¤",
 "Error removing %s from favorites." => "à¦ªà§à¦°à¦¿à§Ÿ à¦¥à§‡à¦•à§‡ %s à¦¸à¦°à¦¿à§Ÿà§‡ à¦«à§‡à¦²à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡à¥¤",
+"Sunday" => "à¦°à¦¬à¦¿à¦¬à¦¾à¦°",
+"Monday" => "à¦¸à§‹à¦®à¦¬à¦¾à¦°",
+"Tuesday" => "à¦®à¦™à§à¦—à¦²à¦¬à¦¾à¦°",
+"Wednesday" => "à¦¬à§à¦§à¦¬à¦¾à¦°",
+"Thursday" => "à¦¬à§ƒà¦¹à¦·à§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°",
+"Friday" => "à¦¶à§à¦•à§à¦°à¦¬à¦¾à¦°",
+"Saturday" => "à¦¶à¦¨à¦¿à¦¬à¦¾à¦°",
+"January" => "à¦œà¦¾à¦¨à§à§Ÿà¦¾à¦°à¦¿",
+"February" => "à¦«à§‡à¦¬à§à¦°à§à§Ÿà¦¾à¦°à¦¿",
+"March" => "à¦®à¦¾à¦°à§à¦š",
+"April" => "à¦à¦ªà§à¦°à¦¿à¦²",
+"May" => "à¦®à§‡",
+"June" => "à¦œà§à¦¨",
+"July" => "à¦œà§à¦²à¦¾à¦‡",
+"August" => "à¦…à¦—à¦¾à¦·à§à¦Ÿ",
+"September" => "à¦¸à§‡à¦ªà§à¦Ÿà§‡à¦®à§à¦¬à¦°",
+"October" => "à¦…à¦•à§à¦Ÿà§‹à¦¬à¦°",
+"November" => "à¦¨à¦à§‡à¦®à§à¦¬à¦°",
+"December" => "à¦¡à¦¿à¦¸à§‡à¦®à§à¦¬à¦°",
 "Settings" => "à¦¨à¦¿à§Ÿà¦¾à¦®à¦•à¦¸à¦®à§‚à¦¹",
 "seconds ago" => "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡ à¦ªà§‚à¦°à§à¦¬à§‡",
 "1 minute ago" => "1 à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡",
@@ -95,25 +114,6 @@
 "Database tablespace" => "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦Ÿà§‡à¦¬à¦²à¦¸à§à¦ªà§‡à¦¸",
 "Database host" => "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦¹à§‹à¦¸à§à¦Ÿ",
 "Finish setup" => "à¦¸à§‡à¦Ÿà¦†à¦ª à¦¸à§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ à¦•à¦°",
-"Sunday" => "à¦°à¦¬à¦¿à¦¬à¦¾à¦°",
-"Monday" => "à¦¸à§‹à¦®à¦¬à¦¾à¦°",
-"Tuesday" => "à¦®à¦™à§à¦—à¦²à¦¬à¦¾à¦°",
-"Wednesday" => "à¦¬à§à¦§à¦¬à¦¾à¦°",
-"Thursday" => "à¦¬à§ƒà¦¹à¦·à§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°",
-"Friday" => "à¦¶à§à¦•à§à¦°à¦¬à¦¾à¦°",
-"Saturday" => "à¦¶à¦¨à¦¿à¦¬à¦¾à¦°",
-"January" => "à¦œà¦¾à¦¨à§à§Ÿà¦¾à¦°à¦¿",
-"February" => "à¦«à§‡à¦¬à§à¦°à§à§Ÿà¦¾à¦°à¦¿",
-"March" => "à¦®à¦¾à¦°à§à¦š",
-"April" => "à¦à¦ªà§à¦°à¦¿à¦²",
-"May" => "à¦®à§‡",
-"June" => "à¦œà§à¦¨",
-"July" => "à¦œà§à¦²à¦¾à¦‡",
-"August" => "à¦…à¦—à¦¾à¦·à§à¦Ÿ",
-"September" => "à¦¸à§‡à¦ªà§à¦Ÿà§‡à¦®à§à¦¬à¦°",
-"October" => "à¦…à¦•à§à¦Ÿà§‹à¦¬à¦°",
-"November" => "à¦¨à¦à§‡à¦®à§à¦¬à¦°",
-"December" => "à¦¡à¦¿à¦¸à§‡à¦®à§à¦¬à¦°",
 "web services under your control" => "à¦“à§Ÿà§‡à¦¬ à¦¸à¦¾à¦°à§à¦à¦¿à¦¸à§‡à¦° à¦¨à¦¿à§Ÿà¦¨à§à¦¤à§à¦°à¦£ à¦†à¦ªà¦¨à¦¾à¦° à¦¹à¦¾à¦¤à§‡à¦° à¦®à§à¦ à§‹à§Ÿ",
 "Log out" => "à¦ªà§à¦°à¦¸à§à¦¥à¦¾à¦¨",
 "Lost your password?" => "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦¹à¦¾à¦°à¦¿à§Ÿà§‡à¦›à§‡à¦¨?",
@@ -121,7 +121,5 @@
 "Log in" => "à¦ªà§à¦°à¦¬à§‡à¦¶",
 "prev" => "à¦ªà§‚à¦°à§à¦¬à¦¬à¦°à§à¦¤à§€",
 "next" => "à¦ªà¦°à¦¬à¦°à§à¦¤à§€",
-"Updating ownCloud to version %s, this may take a while." => "%s à¦à¦¾à¦°à§à¦¸à¦¨à§‡ ownCloud à¦ªà¦°à¦¿à¦¬à¦°à§à¦§à¦¨ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦à¦œà¦¨à§à¦¯ à¦•à¦¿à¦›à§ à¦¸à¦®à§Ÿ à¦ªà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤",
-"Security Warning!" => "à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§à¦¤à¦¾à¦¬à¦¿à¦·à§Ÿà¦• à¦¸à¦¤à¦°à§à¦•à¦¬à¦¾à¦£à§€",
-"Verify" => "à¦¯à¦¾à¦šà¦¾à¦‡ à¦•à¦°"
+"Updating ownCloud to version %s, this may take a while." => "%s à¦à¦¾à¦°à§à¦¸à¦¨à§‡ ownCloud à¦ªà¦°à¦¿à¦¬à¦°à§à¦§à¦¨ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦à¦œà¦¨à§à¦¯ à¦•à¦¿à¦›à§ à¦¸à¦®à§Ÿ à¦ªà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤"
 );
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 8a186bfc54e69b79107d5272461b2c4b59bfc97c..c737f9aa42f5974c611e8af4de1396022d4bad64 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Error en afegir %s als preferits.",
 "No categories selected for deletion." => "No hi ha categories per eliminar.",
 "Error removing %s from favorites." => "Error en eliminar %s dels preferits.",
+"Sunday" => "Diumenge",
+"Monday" => "Dilluns",
+"Tuesday" => "Dimarts",
+"Wednesday" => "Dimecres",
+"Thursday" => "Dijous",
+"Friday" => "Divendres",
+"Saturday" => "Dissabte",
+"January" => "Gener",
+"February" => "Febrer",
+"March" => "MarÃ§",
+"April" => "Abril",
+"May" => "Maig",
+"June" => "Juny",
+"July" => "Juliol",
+"August" => "Agost",
+"September" => "Setembre",
+"October" => "Octubre",
+"November" => "Novembre",
+"December" => "Desembre",
 "Settings" => "Arranjament",
 "seconds ago" => "segons enrere",
 "1 minute ago" => "fa 1 minut",
@@ -63,6 +82,8 @@
 "Error setting expiration date" => "Error en establir la data d'expiraciÃ³",
 "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.",
 "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.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Espai de taula de la base de dades",
 "Database host" => "Ordinador central de la base de dades",
 "Finish setup" => "Acaba la configuraciÃ³",
-"Sunday" => "Diumenge",
-"Monday" => "Dilluns",
-"Tuesday" => "Dimarts",
-"Wednesday" => "Dimecres",
-"Thursday" => "Dijous",
-"Friday" => "Divendres",
-"Saturday" => "Dissabte",
-"January" => "Gener",
-"February" => "Febrer",
-"March" => "MarÃ§",
-"April" => "Abril",
-"May" => "Maig",
-"June" => "Juny",
-"July" => "Juliol",
-"August" => "Agost",
-"September" => "Setembre",
-"October" => "Octubre",
-"November" => "Novembre",
-"December" => "Desembre",
 "web services under your control" => "controleu els vostres serveis web",
 "Log out" => "Surt",
 "Automatic logon rejected!" => "L'ha rebutjat l'acceditaciÃ³ automÃ tica!",
@@ -127,8 +129,5 @@
 "Log in" => "Inici de sessiÃ³",
 "prev" => "anterior",
 "next" => "segÃ¼ent",
-"Updating ownCloud to version %s, this may take a while." => "S'estÃ  actualitzant ownCloud a la versiÃ³ %s, pot trigar una estona.",
-"Security Warning!" => "AvÃs de seguretat!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Comproveu la vostra contrasenya. <br/>Per raons de seguretat se us pot demanar escriure de nou la vostra contrasenya.",
-"Verify" => "Comprova"
+"Updating ownCloud to version %s, this may take a while." => "S'estÃ  actualitzant ownCloud a la versiÃ³ %s, pot trigar una estona."
 );
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 4d2803261b6f0b72f1664c6c5957e0bac1559696..848415d6eac22e51b8b86b1b59e8540a567d2896 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Chyba pÅ™i pÅ™idÃ¡vÃ¡nÃ %s k oblÃbenÃ½m.",
 "No categories selected for deletion." => "Å½Ã¡dnÃ© kategorie nebyly vybrÃ¡ny ke smazÃ¡nÃ.",
 "Error removing %s from favorites." => "Chyba pÅ™i odebÃrÃ¡nÃ %s z oblÃbenÃ½ch.",
+"Sunday" => "NedÄ›le",
+"Monday" => "PondÄ›lÃ",
+"Tuesday" => "ÃšterÃ½",
+"Wednesday" => "StÅ™eda",
+"Thursday" => "ÄŒtvrtek",
+"Friday" => "PÃ¡tek",
+"Saturday" => "Sobota",
+"January" => "Leden",
+"February" => "Ãšnor",
+"March" => "BÅ™ezen",
+"April" => "Duben",
+"May" => "KvÄ›ten",
+"June" => "ÄŒerven",
+"July" => "ÄŒervenec",
+"August" => "Srpen",
+"September" => "ZÃ¡Å™Ã",
+"October" => "Å˜Ãjen",
+"November" => "Listopad",
+"December" => "Prosinec",
 "Settings" => "NastavenÃ",
 "seconds ago" => "pÅ™ed pÃ¡r vteÅ™inami",
 "1 minute ago" => "pÅ™ed minutou",
@@ -63,6 +82,8 @@
 "Error setting expiration date" => "Chyba pÅ™i nastavenÃ data vyprÅ¡enÃ platnosti",
 "Sending ..." => "OdesÃlÃ¡m...",
 "Email sent" => "E-mail odeslÃ¡n",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Aktualizace neprobÄ›hla ÃºspÄ›Å¡nÄ›. Nahlaste prosÃm problÃ©m do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>",
+"The update was successful. Redirecting you to ownCloud now." => "Aktualizace byla ÃºspÄ›Å¡nÃ¡. PÅ™esmÄ›rovÃ¡vÃ¡m na ownCloud.",
 "ownCloud password reset" => "ObnovenÃ hesla pro ownCloud",
 "Use the following link to reset your password: {link}" => "Heslo obnovÃte pouÅ¾itÃm nÃ¡sledujÃcÃho odkazu: {link}",
 "You will receive a link to reset your password via Email." => "Bude VÃ¡m e-mailem zaslÃ¡n odkaz pro obnovu hesla.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "TabulkovÃ½ prostor databÃ¡ze",
 "Database host" => "Hostitel databÃ¡ze",
 "Finish setup" => "DokonÄit nastavenÃ",
-"Sunday" => "NedÄ›le",
-"Monday" => "PondÄ›lÃ",
-"Tuesday" => "ÃšterÃ½",
-"Wednesday" => "StÅ™eda",
-"Thursday" => "ÄŒtvrtek",
-"Friday" => "PÃ¡tek",
-"Saturday" => "Sobota",
-"January" => "Leden",
-"February" => "Ãšnor",
-"March" => "BÅ™ezen",
-"April" => "Duben",
-"May" => "KvÄ›ten",
-"June" => "ÄŒerven",
-"July" => "ÄŒervenec",
-"August" => "Srpen",
-"September" => "ZÃ¡Å™Ã",
-"October" => "Å˜Ãjen",
-"November" => "Listopad",
-"December" => "Prosinec",
 "web services under your control" => "webovÃ© sluÅ¾by pod VaÅ¡Ã kontrolou",
 "Log out" => "OdhlÃ¡sit se",
 "Automatic logon rejected!" => "AutomatickÃ© pÅ™ihlÃ¡Å¡enÃ odmÃtnuto.",
@@ -127,8 +129,5 @@
 "Log in" => "PÅ™ihlÃ¡sit",
 "prev" => "pÅ™edchozÃ",
 "next" => "nÃ¡sledujÃcÃ",
-"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvÃli trvat.",
-"Security Warning!" => "BezpeÄnostnÃ upozornÄ›nÃ.",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "OvÄ›Å™te, prosÃm, svÃ© heslo. <br/>Z bezpeÄnostnÃch dÅ¯vodÅ¯ mÅ¯Å¾ete bÃ½t obÄas poÅ¾Ã¡dÃ¡ni o jeho opÄ›tovnÃ© zadÃ¡nÃ.",
-"Verify" => "OvÄ›Å™it"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizuji ownCloud na verzi %s, bude to chvÃli trvat."
 );
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 26cc6a5e08e9d2aa18434947ba1749e8b32be6bb..3252dcf495e9c275f6bef86f1356bf996c1818ba 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Fejl ved tilfÃ¸jelse af %s til favoritter.",
 "No categories selected for deletion." => "Ingen kategorier valgt",
 "Error removing %s from favorites." => "Fejl ved fjernelse af %s fra favoritter.",
+"Sunday" => "SÃ¸ndag",
+"Monday" => "Mandag",
+"Tuesday" => "Tirsdag",
+"Wednesday" => "Onsdag",
+"Thursday" => "Torsdag",
+"Friday" => "Fredag",
+"Saturday" => "LÃ¸rdag",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Marts",
+"April" => "April",
+"May" => "Maj",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "December",
 "Settings" => "Indstillinger",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minut siden",
@@ -63,6 +82,8 @@
 "Error setting expiration date" => "Fejl under sÃ¦tning af udlÃ¸bsdato",
 "Sending ..." => "Sender ...",
 "Email sent" => "E-mail afsendt",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Opdateringen blev ikke udfÃ¸rt korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udfÃ¸rt korrekt. Du bliver nu viderestillet til ownCloud.",
 "ownCloud password reset" => "Nulstil ownCloud kodeord",
 "Use the following link to reset your password: {link}" => "Anvend fÃ¸lgende link til at nulstille din adgangskode: {link}",
 "You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via email.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Database tabelplads",
 "Database host" => "Databasehost",
 "Finish setup" => "Afslut opsÃ¦tning",
-"Sunday" => "SÃ¸ndag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "LÃ¸rdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Marts",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
 "web services under your control" => "Webtjenester under din kontrol",
 "Log out" => "Log ud",
 "Automatic logon rejected!" => "Automatisk login afvist!",
@@ -127,7 +129,5 @@
 "Log in" => "Log ind",
 "prev" => "forrige",
 "next" => "nÃ¦ste",
-"Security Warning!" => "Sikkerhedsadvarsel!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verificer din adgangskode.<br/>Af sikkerhedsÃ¥rsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen.",
-"Verify" => "Verificer"
+"Updating ownCloud to version %s, this may take a while." => "Opdatere Owncloud til version %s, dette kan tage et stykke tid."
 );
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 76f1379e21ea9255a2b2d490ec76351b6b98a075..b67234189fee239a6aa3c0341c88080b2ed2c889 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Fehler beim HinzufÃ¼gen von %s zu den Favoriten.",
 "No categories selected for deletion." => "Es wurde keine Kategorien zum LÃ¶schen ausgewÃ¤hlt.",
 "Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
+"Sunday" => "Sonntag",
+"Monday" => "Montag",
+"Tuesday" => "Dienstag",
+"Wednesday" => "Mittwoch",
+"Thursday" => "Donnerstag",
+"Friday" => "Freitag",
+"Saturday" => "Samstag",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "MÃ¤rz",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
 "Settings" => "Einstellungen",
 "seconds ago" => "Gerade eben",
 "1 minute ago" => "vor einer Minute",
@@ -63,6 +82,8 @@
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
 "Sending ..." => "Sende ...",
 "Email sent" => "E-Mail wurde verschickt",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Gemeinschaft</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}" => "Nutze den nachfolgenden Link, um Dein Passwort zurÃ¼ckzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Du erhÃ¤ltst einen Link per E-Mail, um Dein Passwort zurÃ¼ckzusetzen.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschlieÃŸen",
-"Sunday" => "Sonntag",
-"Monday" => "Montag",
-"Tuesday" => "Dienstag",
-"Wednesday" => "Mittwoch",
-"Thursday" => "Donnerstag",
-"Friday" => "Freitag",
-"Saturday" => "Samstag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "MÃ¤rz",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Log out" => "Abmelden",
 "Automatic logon rejected!" => "Automatischer Login zurÃ¼ckgewiesen!",
@@ -127,8 +129,5 @@
 "Log in" => "Einloggen",
 "prev" => "ZurÃ¼ck",
 "next" => "Weiter",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern.",
-"Security Warning!" => "Sicherheitswarnung!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte bestÃ¤tige Dein Passwort. <br/> Aus SicherheitsgrÃ¼nden wirst Du hierbei gebeten, Dein Passwort erneut einzugeben.",
-"Verify" => "BestÃ¤tigen"
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern."
 );
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 2eb8758215ffdabd1f19ac743d3d84d5bcc22452..59b05bbe7c178239b6a2d698048ec07b629344fc 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Fehler beim HinzufÃ¼gen von %s zu den Favoriten.",
 "No categories selected for deletion." => "Es wurden keine Kategorien zum LÃ¶schen ausgewÃ¤hlt.",
 "Error removing %s from favorites." => "Fehler beim Entfernen von %s von den Favoriten.",
+"Sunday" => "Sonntag",
+"Monday" => "Montag",
+"Tuesday" => "Dienstag",
+"Wednesday" => "Mittwoch",
+"Thursday" => "Donnerstag",
+"Friday" => "Freitag",
+"Saturday" => "Samstag",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "MÃ¤rz",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
 "Settings" => "Einstellungen",
 "seconds ago" => "Gerade eben",
 "1 minute ago" => "Vor 1 Minute",
@@ -63,6 +82,8 @@
 "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 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}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurÃ¼ckzusetzen.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschlieÃŸen",
-"Sunday" => "Sonntag",
-"Monday" => "Montag",
-"Tuesday" => "Dienstag",
-"Wednesday" => "Mittwoch",
-"Thursday" => "Donnerstag",
-"Friday" => "Freitag",
-"Saturday" => "Samstag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "MÃ¤rz",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
 "Log out" => "Abmelden",
 "Automatic logon rejected!" => "Automatische Anmeldung verweigert.",
@@ -127,8 +129,5 @@
 "Log in" => "Einloggen",
 "prev" => "ZurÃ¼ck",
 "next" => "Weiter",
-"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern.",
-"Security Warning!" => "Sicherheitshinweis!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bitte Ã¼berprÃ¼fen Sie Ihr Passwort. <br/>Aus SicherheitsgrÃ¼nden werden Sie gelegentlich aufgefordert, Ihr Passwort erneut einzugeben.",
-"Verify" => "ÃœberprÃ¼fen"
+"Updating ownCloud to version %s, this may take a while." => "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern."
 );
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 88c169ace7a4a35ea46811e352b6e86ad0463a51..79cffb0685d50e671cab81fd38c0a82ee9850ebb 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Î£Ï†Î¬Î»Î¼Î± Ï€ÏÎ¿ÏƒÎ¸Î®ÎºÎ·Ï‚ %s ÏƒÏ„Î± Î±Î³Î±Ï€Î·Î¼ÎÎ½Î±.",
 "No categories selected for deletion." => "Î”ÎµÎ½ ÎµÏ€Î¹Î»ÎÏ‡Ï„Î·ÎºÎ±Î½ ÎºÎ±Ï„Î·Î³Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Î´Î¹Î±Î³ÏÎ±Ï†Î®.",
 "Error removing %s from favorites." => "Î£Ï†Î¬Î»Î¼Î± Î±Ï†Î±Î¯ÏÎµÏƒÎ·Ï‚ %s Î±Ï€ÏŒ Ï„Î± Î±Î³Î±Ï€Î·Î¼ÎÎ½Î±.",
+"Sunday" => "ÎšÏ…ÏÎ¹Î±ÎºÎ®",
+"Monday" => "Î”ÎµÏ…Ï„ÎÏÎ±",
+"Tuesday" => "Î¤ÏÎ¯Ï„Î·",
+"Wednesday" => "Î¤ÎµÏ„Î¬ÏÏ„Î·",
+"Thursday" => "Î ÎÎ¼Ï€Ï„Î·",
+"Friday" => "Î Î±ÏÎ±ÏƒÎºÎµÏ…Î®",
+"Saturday" => "Î£Î¬Î²Î²Î±Ï„Î¿",
+"January" => "Î™Î±Î½Î¿Ï…Î¬ÏÎ¹Î¿Ï‚",
+"February" => "Î¦ÎµÎ²ÏÎ¿Ï…Î¬ÏÎ¹Î¿Ï‚",
+"March" => "ÎœÎ¬ÏÏ„Î¹Î¿Ï‚",
+"April" => "Î‘Ï€ÏÎ¯Î»Î¹Î¿Ï‚",
+"May" => "ÎœÎ¬ÏŠÎ¿Ï‚",
+"June" => "Î™Î¿ÏÎ½Î¹Î¿Ï‚",
+"July" => "Î™Î¿ÏÎ»Î¹Î¿Ï‚",
+"August" => "Î‘ÏÎ³Î¿Ï…ÏƒÏ„Î¿Ï‚",
+"September" => "Î£ÎµÏ€Ï„ÎÎ¼Î²ÏÎ¹Î¿Ï‚",
+"October" => "ÎŸÎºÏ„ÏŽÎ²ÏÎ¹Î¿Ï‚",
+"November" => "ÎÎ¿ÎÎ¼Î²ÏÎ¹Î¿Ï‚",
+"December" => "Î”ÎµÎºÎÎ¼Î²ÏÎ¹Î¿Ï‚",
 "Settings" => "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚",
 "seconds ago" => "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½",
 "1 minute ago" => "1 Î»ÎµÏ€Ï„ÏŒ Ï€ÏÎ¹Î½",
@@ -98,25 +117,6 @@
 "Database tablespace" => "ÎšÎµÎ½Î¬ Î Î¹Î½Î¬ÎºÏ‰Î½ Î’Î¬ÏƒÎ·Ï‚ Î”ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½",
 "Database host" => "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½",
 "Finish setup" => "ÎŸÎ»Î¿ÎºÎ»Î®ÏÏ‰ÏƒÎ· ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚",
-"Sunday" => "ÎšÏ…ÏÎ¹Î±ÎºÎ®",
-"Monday" => "Î”ÎµÏ…Ï„ÎÏÎ±",
-"Tuesday" => "Î¤ÏÎ¯Ï„Î·",
-"Wednesday" => "Î¤ÎµÏ„Î¬ÏÏ„Î·",
-"Thursday" => "Î ÎÎ¼Ï€Ï„Î·",
-"Friday" => "Î Î±ÏÎ±ÏƒÎºÎµÏ…Î®",
-"Saturday" => "Î£Î¬Î²Î²Î±Ï„Î¿",
-"January" => "Î™Î±Î½Î¿Ï…Î¬ÏÎ¹Î¿Ï‚",
-"February" => "Î¦ÎµÎ²ÏÎ¿Ï…Î¬ÏÎ¹Î¿Ï‚",
-"March" => "ÎœÎ¬ÏÏ„Î¹Î¿Ï‚",
-"April" => "Î‘Ï€ÏÎ¯Î»Î¹Î¿Ï‚",
-"May" => "ÎœÎ¬ÏŠÎ¿Ï‚",
-"June" => "Î™Î¿ÏÎ½Î¹Î¿Ï‚",
-"July" => "Î™Î¿ÏÎ»Î¹Î¿Ï‚",
-"August" => "Î‘ÏÎ³Î¿Ï…ÏƒÏ„Î¿Ï‚",
-"September" => "Î£ÎµÏ€Ï„ÎÎ¼Î²ÏÎ¹Î¿Ï‚",
-"October" => "ÎŸÎºÏ„ÏŽÎ²ÏÎ¹Î¿Ï‚",
-"November" => "ÎÎ¿ÎÎ¼Î²ÏÎ¹Î¿Ï‚",
-"December" => "Î”ÎµÎºÎÎ¼Î²ÏÎ¹Î¿Ï‚",
 "web services under your control" => "Î¥Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚ web Ï…Ï€ÏŒ Ï„Î¿Î½ ÎÎ»ÎµÎ³Ï‡ÏŒ ÏƒÎ±Ï‚",
 "Log out" => "Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ·",
 "Automatic logon rejected!" => "Î‘Ï€Î¿ÏÏÎ¯Ï†Î¸Î·ÎºÎµ Î· Î±Ï…Ï„ÏŒÎ¼Î±Ï„Î· ÏƒÏÎ½Î´ÎµÏƒÎ·!",
@@ -127,7 +127,5 @@
 "Log in" => "Î•Î¯ÏƒÎ¿Î´Î¿Ï‚",
 "prev" => "Ï€ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿",
 "next" => "ÎµÏ€ÏŒÎ¼ÎµÎ½Î¿",
-"Security Warning!" => "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î‘ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¹ÏŽÏƒÏ„Îµ Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÎ±Ï‚. <br/>Î“Î¹Î± Î»ÏŒÎ³Î¿Ï…Ï‚ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÏÏ‰Ï„Î¬ÏƒÏ„Îµ Î½Î± ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Î¾Î±Î½Î¬ Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÎ±Ï‚.",
-"Verify" => "Î•Ï€Î±Î»Î®Î¸ÎµÏ…ÏƒÎ·"
+"Updating ownCloud to version %s, this may take a while." => "Î•Î½Î·Î¼ÎµÏÏŽÎ½Î¿Î½Ï„Î±Ï‚ Ï„Î¿ ownCloud ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s,Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€Î¬ÏÎµÎ¹ Î»Î¯Î³Î¿ Ï‡ÏÏŒÎ½Î¿."
 );
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 0cbe7d33be67d1f117c6d0e14a043028f556bdab..0839cfe9f6f809ebdeccde44a491a712826e48fa 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Eraro dum aldono de %s al favoratoj.",
 "No categories selected for deletion." => "Neniu kategorio elektiÄis por forigo.",
 "Error removing %s from favorites." => "Eraro dum forigo de %s el favoratoj.",
+"Sunday" => "dimanÄ‰o",
+"Monday" => "lundo",
+"Tuesday" => "mardo",
+"Wednesday" => "merkredo",
+"Thursday" => "ÄµaÅdo",
+"Friday" => "vendredo",
+"Saturday" => "sabato",
+"January" => "Januaro",
+"February" => "Februaro",
+"March" => "Marto",
+"April" => "Aprilo",
+"May" => "Majo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "AÅgusto",
+"September" => "Septembro",
+"October" => "Oktobro",
+"November" => "Novembro",
+"December" => "Decembro",
 "Settings" => "Agordo",
 "seconds ago" => "sekundoj antaÅe",
 "1 minute ago" => "antaÅ 1 minuto",
@@ -95,25 +114,6 @@
 "Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
-"Sunday" => "dimanÄ‰o",
-"Monday" => "lundo",
-"Tuesday" => "mardo",
-"Wednesday" => "merkredo",
-"Thursday" => "ÄµaÅdo",
-"Friday" => "vendredo",
-"Saturday" => "sabato",
-"January" => "Januaro",
-"February" => "Februaro",
-"March" => "Marto",
-"April" => "Aprilo",
-"May" => "Majo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "AÅgusto",
-"September" => "Septembro",
-"October" => "Oktobro",
-"November" => "Novembro",
-"December" => "Decembro",
 "web services under your control" => "TTT-servoj sub via kontrolo",
 "Log out" => "Elsaluti",
 "If you did not change your password recently, your account may be compromised!" => "Se vi ne ÅanÄis vian pasvorton lastatempe, via konto eble kompromitas!",
@@ -122,8 +122,5 @@
 "remember" => "memori",
 "Log in" => "Ensaluti",
 "prev" => "maljena",
-"next" => "jena",
-"Security Warning!" => "Sekureca averto!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Bonvolu kontroli vian pasvorton. <br/>Pro sekureco, oni okaze povas peti al vi enigi vian pasvorton ree.",
-"Verify" => "Kontroli"
+"next" => "jena"
 );
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 2cc604f590c03e84fee03178ccd11b285ee0a09b..4bdbcac0e95f6782aad02866f46ecddcb3ca8d4a 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Error aÃ±adiendo %s a los favoritos.",
 "No categories selected for deletion." => "No hay categorÃas seleccionadas para borrar.",
 "Error removing %s from favorites." => "Error eliminando %s de los favoritos.",
+"Sunday" => "Domingo",
+"Monday" => "Lunes",
+"Tuesday" => "Martes",
+"Wednesday" => "MiÃ©rcoles",
+"Thursday" => "Jueves",
+"Friday" => "Viernes",
+"Saturday" => "SÃ¡bado",
+"January" => "Enero",
+"February" => "Febrero",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Mayo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Agosto",
+"September" => "Septiembre",
+"October" => "Octubre",
+"November" => "Noviembre",
+"December" => "Diciembre",
 "Settings" => "Ajustes",
 "seconds ago" => "hace segundos",
 "1 minute ago" => "hace 1 minuto",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalaciÃ³n",
-"Sunday" => "Domingo",
-"Monday" => "Lunes",
-"Tuesday" => "Martes",
-"Wednesday" => "MiÃ©rcoles",
-"Thursday" => "Jueves",
-"Friday" => "Viernes",
-"Saturday" => "SÃ¡bado",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
 "web services under your control" => "servicios web bajo tu control",
 "Log out" => "Salir",
 "Automatic logon rejected!" => "Â¡Inicio de sesiÃ³n automÃ¡tico rechazado!",
@@ -127,8 +127,5 @@
 "Log in" => "Entrar",
 "prev" => "anterior",
 "next" => "siguiente",
-"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versiÃ³n %s, esto puede demorar un tiempo.",
-"Security Warning!" => "Â¡Advertencia de seguridad!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique su contraseÃ±a. <br/>Por razones de seguridad se le puede volver a preguntar ocasionalmente la contraseÃ±a.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versiÃ³n %s, esto puede demorar un tiempo."
 );
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 48b8177573b534b3afbcaa0235892b8c46072a17..d588ac950c96890dbf87a1e0d4de83f2e5feb740 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Error al agregar %s a favoritos. ",
 "No categories selected for deletion." => "No hay categorÃas seleccionadas para borrar.",
 "Error removing %s from favorites." => "Error al remover %s de favoritos. ",
+"Sunday" => "Domingo",
+"Monday" => "Lunes",
+"Tuesday" => "Martes",
+"Wednesday" => "MiÃ©rcoles",
+"Thursday" => "Jueves",
+"Friday" => "Viernes",
+"Saturday" => "SÃ¡bado",
+"January" => "Enero",
+"February" => "Febrero",
+"March" => "Marzo",
+"April" => "Abril",
+"May" => "Mayo",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Agosto",
+"September" => "Septiembre",
+"October" => "Octubre",
+"November" => "Noviembre",
+"December" => "Diciembre",
 "Settings" => "Ajustes",
 "seconds ago" => "segundos atrÃ¡s",
 "1 minute ago" => "hace 1 minuto",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalaciÃ³n",
-"Sunday" => "Domingo",
-"Monday" => "Lunes",
-"Tuesday" => "Martes",
-"Wednesday" => "MiÃ©rcoles",
-"Thursday" => "Jueves",
-"Friday" => "Viernes",
-"Saturday" => "SÃ¡bado",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
 "web services under your control" => "servicios web sobre los que tenÃ©s control",
 "Log out" => "Cerrar la sesiÃ³n",
 "Automatic logon rejected!" => "Â¡El inicio de sesiÃ³n automÃ¡tico fue rechazado!",
@@ -127,7 +127,5 @@
 "Log in" => "Entrar",
 "prev" => "anterior",
 "next" => "siguiente",
-"Security Warning!" => "Â¡Advertencia de seguridad!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verificÃ¡ tu contraseÃ±a. <br/>Por razones de seguridad, puede ser que que te pregunte ocasionalmente la contraseÃ±a.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "Actualizando ownCloud a la versiÃ³n %s, puede domorar un rato."
 );
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 226c0d27e80ff53f5ba2837f793000d883afcfdc..4e3c003c9f61dbb16d9e45a607eb0ff040c842c9 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -2,6 +2,25 @@
 "No category to add?" => "Pole kategooriat, mida lisada?",
 "This category already exists: " => "See kategooria on juba olemas: ",
 "No categories selected for deletion." => "Kustutamiseks pole kategooriat valitud.",
+"Sunday" => "PÃ¼hapÃ¤ev",
+"Monday" => "EsmaspÃ¤ev",
+"Tuesday" => "TeisipÃ¤ev",
+"Wednesday" => "KolmapÃ¤ev",
+"Thursday" => "NeljapÃ¤ev",
+"Friday" => "Reede",
+"Saturday" => "LaupÃ¤ev",
+"January" => "Jaanuar",
+"February" => "Veebruar",
+"March" => "MÃ¤rts",
+"April" => "Aprill",
+"May" => "Mai",
+"June" => "Juuni",
+"July" => "Juuli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktoober",
+"November" => "November",
+"December" => "Detsember",
 "Settings" => "Seaded",
 "seconds ago" => "sekundit tagasi",
 "1 minute ago" => "1 minut tagasi",
@@ -74,25 +93,6 @@
 "Database tablespace" => "Andmebaasi tabeliruum",
 "Database host" => "Andmebaasi host",
 "Finish setup" => "LÃµpeta seadistamine",
-"Sunday" => "PÃ¼hapÃ¤ev",
-"Monday" => "EsmaspÃ¤ev",
-"Tuesday" => "TeisipÃ¤ev",
-"Wednesday" => "KolmapÃ¤ev",
-"Thursday" => "NeljapÃ¤ev",
-"Friday" => "Reede",
-"Saturday" => "LaupÃ¤ev",
-"January" => "Jaanuar",
-"February" => "Veebruar",
-"March" => "MÃ¤rts",
-"April" => "Aprill",
-"May" => "Mai",
-"June" => "Juuni",
-"July" => "Juuli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktoober",
-"November" => "November",
-"December" => "Detsember",
 "web services under your control" => "veebiteenused sinu kontrolli all",
 "Log out" => "Logi vÃ¤lja",
 "Automatic logon rejected!" => "Automaatne sisselogimine lÃ¼kati tagasi!",
@@ -102,7 +102,5 @@
 "remember" => "pea meeles",
 "Log in" => "Logi sisse",
 "prev" => "eelm",
-"next" => "jÃ¤rgm",
-"Security Warning!" => "turvahoiatus!",
-"Verify" => "Kinnita"
+"next" => "jÃ¤rgm"
 );
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index becd4d83b669ca537483ab135818ac03884a1bbe..da6aad733830845694289bedcb4b065dfb88229d 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Errorea gertatu da %s gogokoetara gehitzean.",
 "No categories selected for deletion." => "Ez da ezabatzeko kategoriarik hautatu.",
 "Error removing %s from favorites." => "Errorea gertatu da %s gogokoetatik ezabatzean.",
+"Sunday" => "Igandea",
+"Monday" => "Astelehena",
+"Tuesday" => "Asteartea",
+"Wednesday" => "Asteazkena",
+"Thursday" => "Osteguna",
+"Friday" => "Ostirala",
+"Saturday" => "Larunbata",
+"January" => "Urtarrila",
+"February" => "Otsaila",
+"March" => "Martxoa",
+"April" => "Apirila",
+"May" => "Maiatza",
+"June" => "Ekaina",
+"July" => "Uztaila",
+"August" => "Abuztua",
+"September" => "Iraila",
+"October" => "Urria",
+"November" => "Azaroa",
+"December" => "Abendua",
 "Settings" => "Ezarpenak",
 "seconds ago" => "segundu",
 "1 minute ago" => "orain dela minutu 1",
@@ -63,6 +82,8 @@
 "Error setting expiration date" => "Errore bat egon da muga data ezartzean",
 "Sending ..." => "Bidaltzen ...",
 "Email sent" => "Eposta bidalia",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
 "ownCloud password reset" => "ownCloud-en pasahitza berrezarri",
 "Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
 "You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Datu basearen taula-lekua",
 "Database host" => "Datubasearen hostalaria",
 "Finish setup" => "Bukatu konfigurazioa",
-"Sunday" => "Igandea",
-"Monday" => "Astelehena",
-"Tuesday" => "Asteartea",
-"Wednesday" => "Asteazkena",
-"Thursday" => "Osteguna",
-"Friday" => "Ostirala",
-"Saturday" => "Larunbata",
-"January" => "Urtarrila",
-"February" => "Otsaila",
-"March" => "Martxoa",
-"April" => "Apirila",
-"May" => "Maiatza",
-"June" => "Ekaina",
-"July" => "Uztaila",
-"August" => "Abuztua",
-"September" => "Iraila",
-"October" => "Urria",
-"November" => "Azaroa",
-"December" => "Abendua",
 "web services under your control" => "web zerbitzuak zure kontrolpean",
 "Log out" => "Saioa bukatu",
 "Automatic logon rejected!" => "Saio hasiera automatikoa ez onartuta!",
@@ -127,7 +129,5 @@
 "Log in" => "Hasi saioa",
 "prev" => "aurrekoa",
 "next" => "hurrengoa",
-"Security Warning!" => "Segurtasun abisua",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Mesedez egiaztatu zure pasahitza. <br/>Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu.",
-"Verify" => "Egiaztatu"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud %s bertsiora eguneratzen, denbora har dezake."
 );
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index a7c3c9ab2e53347c6bff202ce1fc6f8fbf9ab8b0..7ed2831d821b9ecfc3d579024845f7a62dc4a091 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -1,26 +1,89 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Ú©Ø§Ø±Ø¨Ø± %s  ÛŒÚ© Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø§Ø³Øª.",
+"User %s shared a folder with you" => "Ú©Ø§Ø±Ø¨Ø± %s  ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø§Ø³Øª.",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Ú©Ø§Ø±Ø¨Ø± %s Ù¾Ø±ÙˆÙ†Ø¯Ù‡ \"%s\" Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø§Ø³Øª. Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø§ÛŒÙ†Ø¬Ø§Ø³Øª : %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Ú©Ø§Ø±Ø¨Ø± %s Ù¾ÙˆØ´Ù‡ \"%s\" Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø§Ø³Øª. Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø§ÛŒÙ†Ø¬Ø§Ø³Øª : %s",
+"Category type not provided." => "Ù†ÙˆØ¹ Ø¯Ø³ØªÙ‡ Ø¨Ù†Ø¯ÛŒ Ø§Ø±Ø§Ø¦Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.",
 "No category to add?" => "Ø¢ÛŒØ§ Ú¯Ø±ÙˆÙ‡ Ø¯ÛŒÚ¯Ø±ÛŒ Ø¨Ø±Ø§ÛŒ Ø§ÙØ²ÙˆØ¯Ù† Ù†Ø¯Ø§Ø±ÛŒØ¯",
 "This category already exists: " => "Ø§ÛŒÙ† Ú¯Ø±ÙˆÙ‡ Ø§Ø² Ù‚Ø¨Ù„ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯Ù‡",
+"Object type not provided." => "Ù†ÙˆØ¹ Ø´ÛŒ Ø§Ø±Ø§Ø¦Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.",
+"%s ID not provided." => "Ø´Ù†Ø§Ø³Ù‡ %s  Ø§Ø±Ø§Ø¦Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.",
+"Error adding %s to favorites." => "Ø®Ø·Ø§ÛŒ Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† %s  Ø¨Ù‡ Ø¹Ù„Ø§Ù‚Ù‡ Ù…Ù†Ø¯ÛŒ Ù‡Ø§.",
 "No categories selected for deletion." => "Ù‡ÛŒØ¬ Ø¯Ø³ØªÙ‡ Ø§ÛŒ Ø¨Ø±Ø§ÛŒ Ù¾Ø§Ú© Ø´Ø¯Ù† Ø§Ù†ØªØ®Ø§Ø¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª",
+"Error removing %s from favorites." => "Ø®Ø·Ø§ÛŒ Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† %s Ø§Ø² Ø¹Ù„Ø§Ù‚Ù‡ Ù…Ù†Ø¯ÛŒ Ù‡Ø§.",
+"Sunday" => "ÛŒÚ©Ø´Ù†Ø¨Ù‡",
+"Monday" => "Ø¯ÙˆØ´Ù†Ø¨Ù‡",
+"Tuesday" => "Ø³Ù‡ Ø´Ù†Ø¨Ù‡",
+"Wednesday" => "Ú†Ù‡Ø§Ø±Ø´Ù†Ø¨Ù‡",
+"Thursday" => "Ù¾Ù†Ø¬Ø´Ù†Ø¨Ù‡",
+"Friday" => "Ø¬Ù…Ø¹Ù‡",
+"Saturday" => "Ø´Ù†Ø¨Ù‡",
+"January" => "Ú˜Ø§Ù†ÙˆÛŒÙ‡",
+"February" => "ÙØ¨Ø±ÛŒÙ‡",
+"March" => "Ù…Ø§Ø±Ø³",
+"April" => "Ø¢ÙˆØ±ÛŒÙ„",
+"May" => "Ù…ÛŒ",
+"June" => "Ú˜ÙˆØ¦Ù†",
+"July" => "Ø¬ÙˆÙ„Ø§ÛŒ",
+"August" => "Ø¢Ú¯ÙˆØ³Øª",
+"September" => "Ø³Ù¾ØªØ§Ù…Ø¨Ø±",
+"October" => "Ø§Ú©ØªØ¨Ø±",
+"November" => "Ù†ÙˆØ§Ù…Ø¨Ø±",
+"December" => "Ø¯Ø³Ø§Ù…Ø¨Ø±",
 "Settings" => "ØªÙ†Ø¸ÛŒÙ…Ø§Øª",
 "seconds ago" => "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´",
 "1 minute ago" => "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´",
+"{minutes} minutes ago" => "{Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§} Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§ÛŒ Ù¾ÛŒØ´",
+"1 hour ago" => "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´",
+"{hours} hours ago" => "{Ø³Ø§Ø¹Øª Ù‡Ø§} Ø³Ø§Ø¹Øª Ù‡Ø§ Ù¾ÛŒØ´",
 "today" => "Ø§Ù…Ø±ÙˆØ²",
 "yesterday" => "Ø¯ÛŒØ±ÙˆØ²",
+"{days} days ago" => "{Ø±ÙˆØ²Ù‡Ø§} Ø±ÙˆØ²Ù‡Ø§ÛŒ Ù¾ÛŒØ´",
 "last month" => "Ù…Ø§Ù‡ Ù‚Ø¨Ù„",
+"{months} months ago" => "{Ù…Ø§Ù‡ Ù‡Ø§} Ù…Ø§Ù‡ Ù‡Ø§ Ù¾ÛŒØ´",
 "months ago" => "Ù…Ø§Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„",
 "last year" => "Ø³Ø§Ù„ Ù‚Ø¨Ù„",
 "years ago" => "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„",
+"Choose" => "Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù†",
 "Cancel" => "Ù…Ù†ØµØ±Ù Ø´Ø¯Ù†",
 "No" => "Ù†Ù‡",
 "Yes" => "Ø¨Ù„Ù‡",
 "Ok" => "Ù‚Ø¨ÙˆÙ„",
+"The object type is not specified." => "Ù†ÙˆØ¹ Ø´ÛŒ ØªØ¹ÛŒÛŒÙ† Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.",
 "Error" => "Ø®Ø·Ø§",
+"The app name is not specified." => "Ù†Ø§Ù… Ø¨Ø±Ù†Ø§Ù…Ù‡ ØªØ¹ÛŒÛŒÙ† Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª.",
+"The required file {file} is not installed!" => "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ { Ù¾Ø±ÙˆÙ†Ø¯Ù‡} Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´Ø¯Ù‡ Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª !",
+"Error while sharing" => "Ø®Ø·Ø§ Ø¯Ø±ØØ§Ù„ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ†",
+"Error while unsharing" => "Ø®Ø·Ø§ Ø¯Ø±ØØ§Ù„ Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©",
+"Error while changing permissions" => "Ø®Ø·Ø§ Ø¯Ø± ØØ§Ù„ ØªØºÛŒÛŒØ± Ù…Ø¬ÙˆØ²",
+"Shared with you and the group {group} by {owner}" => "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§ Ø´Ù…Ø§ Ùˆ Ú¯Ø±ÙˆÙ‡ {Ú¯Ø±ÙˆÙ‡} ØªÙˆØ³Ø· {Ø¯Ø§Ø±Ù†Ø¯Ù‡}",
+"Shared with you by {owner}" => "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§ Ø´Ù…Ø§ ØªÙˆØ³Ø· { Ø¯Ø§Ø±Ù†Ø¯Ù‡}",
+"Share with" => "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø§",
+"Share with link" => "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø§ Ù¾ÛŒÙˆÙ†Ø¯",
+"Password protect" => "Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ú©Ø±Ø¯Ù† Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±",
 "Password" => "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡",
+"Email link to person" => "Ù¾ÛŒÙˆÙ†Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ø±Ø§ÛŒ Ø´Ø®Øµ.",
+"Set expiration date" => "ØªÙ†Ø¸ÛŒÙ… ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§",
+"Expiration date" => "ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§",
+"Share via email:" => "Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ø¨Ú¯Ø°Ø§Ø±ÛŒØ¯ :",
+"No people found" => "Ú©Ø³ÛŒ ÛŒØ§ÙØª Ù†Ø´Ø¯",
+"Resharing is not allowed" => "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯ Ù…Ø¬Ø§Ø² Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯",
+"Shared in {item} with {user}" => "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¯Ø± {Ø¨Ø®Ø´} Ø¨Ø§ {Ú©Ø§Ø±Ø¨Ø±}",
+"Unshare" => "Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©",
+"can edit" => "Ù…ÛŒ ØªÙˆØ§Ù† ÙˆÛŒØ±Ø§ÛŒØ´ Ú©Ø±Ø¯",
+"access control" => "Ú©Ù†ØªØ±Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ",
 "create" => "Ø§ÛŒØ¬Ø§Ø¯",
+"update" => "Ø¨Ù‡ Ø±ÙˆØ²",
+"delete" => "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†",
+"share" => "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ†",
+"Password protected" => "Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ø§Ø² Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±",
+"Error unsetting expiration date" => "Ø®Ø·Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ… Ù†Ú©Ø±Ø¯Ù† ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§ ",
+"Error setting expiration date" => "Ø®Ø·Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ… ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§",
 "ownCloud password reset" => "Ù¾Ø³ÙˆØ±Ø¯ Ø§Ø¨Ø±Ù‡Ø§ÛŒ Ø´Ù…Ø§ ØªØºÛŒÛŒØ±Ú©Ø±Ø¯",
 "Use the following link to reset your password: {link}" => "Ø§Ø² Ù„ÛŒÙ†Ú© Ø²ÛŒØ± Ø¬Ù‡Øª Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø³Ø§Ø²ÛŒ Ù¾Ø³ÙˆØ±Ø¯ Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ù†ÛŒØ¯ :\n{link}",
 "You will receive a link to reset your password via Email." => "Ø´Ù…Ø§ ÛŒÚ© Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ ØØ§ÙˆÛŒ ÛŒÚ© Ù„ÛŒÙ†Ú© Ø¬Ù‡Øª Ø¨Ø§Ø²Ø³Ø§Ø²ÛŒ Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ Ø¯Ø±ÛŒØ§ÙØª Ø®ÙˆØ§Ù‡ÛŒØ¯ Ú©Ø±Ø¯.",
+"Reset email send." => "ØªÙ†Ø¸ÛŒÙ… Ù…Ø¬Ø¯Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø±Ø§ Ø¨ÙØ±Ø³ØªÛŒØ¯.",
+"Request failed!" => "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø±Ø¯ Ø´Ø¯Ù‡ Ø§Ø³Øª !",
 "Username" => "Ø´Ù†Ø§Ø³Ù‡",
 "Request reset" => "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø¯ÙˆØ¨Ø§Ø±Ù‡ Ø³Ø§Ø²ÛŒ",
 "Your password was reset" => "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ Ø´Ù…Ø§ ØªØºÛŒÛŒØ±Ú©Ø±Ø¯",
@@ -37,6 +100,7 @@
 "Edit categories" => "ÙˆÛŒØ±Ø§ÛŒØ´ Ú¯Ø±ÙˆÙ‡ Ù‡Ø§",
 "Add" => "Ø§ÙØ²ÙˆØ¯Ù†",
 "Security Warning" => "Ø§Ø®Ø·Ø§Ø± Ø§Ù…Ù†ÛŒØªÛŒ",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ù‡ÛŒÚ† Ù…ÙˆÙ„Ø¯ ØªØµØ§Ø¯ÙÛŒ Ø§Ù…Ù† Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³ØªØŒ Ù„Ø·ÙØ§ ÙØ±Ù…Øª PHP OpenSSL Ø±Ø§ ÙØ¹Ø§Ù„ Ù†Ù…Ø§ÛŒÛŒØ¯.",
 "Create an <strong>admin account</strong>" => "Ù„Ø·ÙØ§ ÛŒÚ© <strong> Ø´Ù†Ø§Ø³Ù‡ Ø¨Ø±Ø§ÛŒ Ù…Ø¯ÛŒØ±</strong> Ø¨Ø³Ø§Ø²ÛŒØ¯",
 "Advanced" => "ØØ±ÙÙ‡ Ø§ÛŒ",
 "Data folder" => "Ù¾ÙˆØ´Ù‡ Ø§Ø·Ù„Ø§Ø¹Ø§ØªÛŒ",
@@ -45,29 +109,14 @@
 "Database user" => "Ø´Ù†Ø§Ø³Ù‡ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡",
 "Database password" => "Ù¾Ø³ÙˆØ±Ø¯ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡",
 "Database name" => "Ù†Ø§Ù… Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡",
+"Database tablespace" => "Ø¬Ø¯ÙˆÙ„ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡",
 "Database host" => "Ù‡Ø§Ø³Øª Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡",
 "Finish setup" => "Ø§ØªÙ…Ø§Ù… Ù†ØµØ¨",
-"Sunday" => "ÛŒÚ©Ø´Ù†Ø¨Ù‡",
-"Monday" => "Ø¯ÙˆØ´Ù†Ø¨Ù‡",
-"Tuesday" => "Ø³Ù‡ Ø´Ù†Ø¨Ù‡",
-"Wednesday" => "Ú†Ù‡Ø§Ø±Ø´Ù†Ø¨Ù‡",
-"Thursday" => "Ù¾Ù†Ø¬Ø´Ù†Ø¨Ù‡",
-"Friday" => "Ø¬Ù…Ø¹Ù‡",
-"Saturday" => "Ø´Ù†Ø¨Ù‡",
-"January" => "Ú˜Ø§Ù†ÙˆÛŒÙ‡",
-"February" => "ÙØ¨Ø±ÛŒÙ‡",
-"March" => "Ù…Ø§Ø±Ø³",
-"April" => "Ø¢ÙˆØ±ÛŒÙ„",
-"May" => "Ù…ÛŒ",
-"June" => "Ú˜ÙˆØ¦Ù†",
-"July" => "Ø¬ÙˆÙ„Ø§ÛŒ",
-"August" => "Ø¢Ú¯ÙˆØ³Øª",
-"September" => "Ø³Ù¾ØªØ§Ù…Ø¨Ø±",
-"October" => "Ø§Ú©ØªØ¨Ø±",
-"November" => "Ù†ÙˆØ§Ù…Ø¨Ø±",
-"December" => "Ø¯Ø³Ø§Ù…Ø¨Ø±",
 "web services under your control" => "Ø³Ø±ÙˆÛŒØ³ ÙˆØ¨ ØªØØª Ú©Ù†ØªØ±Ù„ Ø´Ù…Ø§",
 "Log out" => "Ø®Ø±ÙˆØ¬",
+"Automatic logon rejected!" => "ÙˆØ±ÙˆØ¯ Ø¨Ù‡ Ø³ÛŒØ³ØªÙ… Ø§ØªÙˆÙ…Ø§ØªÛŒÚ© Ø±Ø¯Ø´Ø¯!",
+"If you did not change your password recently, your account may be compromised!" => "Ø§Ú¯Ø± Ø´Ù…Ø§ Ø§Ø®ÛŒØ±Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø±Ø§ ØªØºÛŒÛŒØ± Ù†Ø¯Ø§Ø¯Ù‡ Ø§ÛŒØ¯ØŒ ØØ³Ø§Ø¨ Ø´Ù…Ø§ Ø¯Ø± Ù…Ø¹Ø±Ø¶ Ø®Ø·Ø± Ù…ÛŒ Ø¨Ø§Ø´Ø¯ !",
+"Please change your password to secure your account again." => "Ù„Ø·ÙØ§ Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± Ø®ÙˆØ¯ Ø±Ø§ ØªØºÛŒÛŒØ± Ø¯Ù‡ÛŒØ¯ ØªØ§ Ù…Ø¬Ø¯Ø¯Ø§ ØØ³Ø§Ø¨ Ø´Ù…Ø§  Ø¯Ø± Ø§Ù…Ø§Ù† Ø¨Ø§Ø´Ø¯.",
 "Lost your password?" => "Ø¢ÛŒØ§ Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ ØªØ§Ù† Ø±Ø§ Ø¨Ù‡ ÛŒØ§Ø¯ Ù†Ù…ÛŒ Ø¢ÙˆØ±ÛŒØ¯ØŸ",
 "remember" => "Ø¨ÛŒØ§Ø¯ Ø¢ÙˆØ±ÛŒ",
 "Log in" => "ÙˆØ±ÙˆØ¯",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 3d3bd93845fb2d057bbe8bfa68932e47a71aa207..6b5a833f36e33360174bca768fd08195511d68e2 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -5,7 +5,28 @@
 "User %s shared the folder \"%s\" with you. It is available for download here: %s" => "KÃ¤yttÃ¤jÃ¤ %s jakoi kansion \"%s\" kanssasi. Se on ladattavissa tÃ¤Ã¤ltÃ¤: %s",
 "No category to add?" => "Ei lisÃ¤ttÃ¤vÃ¤Ã¤ luokkaa?",
 "This category already exists: " => "TÃ¤mÃ¤ luokka on jo olemassa: ",
+"Error adding %s to favorites." => "Virhe lisÃ¤tessÃ¤ kohdetta %s suosikkeihin.",
 "No categories selected for deletion." => "Luokkia ei valittu poistettavaksi.",
+"Error removing %s from favorites." => "Virhe poistaessa kohdetta %s suosikeista.",
+"Sunday" => "Sunnuntai",
+"Monday" => "Maanantai",
+"Tuesday" => "Tiistai",
+"Wednesday" => "Keskiviikko",
+"Thursday" => "Torstai",
+"Friday" => "Perjantai",
+"Saturday" => "Lauantai",
+"January" => "Tammikuu",
+"February" => "Helmikuu",
+"March" => "Maaliskuu",
+"April" => "Huhtikuu",
+"May" => "Toukokuu",
+"June" => "KesÃ¤kuu",
+"July" => "HeinÃ¤kuu",
+"August" => "Elokuu",
+"September" => "Syyskuu",
+"October" => "Lokakuu",
+"November" => "Marraskuu",
+"December" => "Joulukuu",
 "Settings" => "Asetukset",
 "seconds ago" => "sekuntia sitten",
 "1 minute ago" => "1 minuutti sitten",
@@ -31,6 +52,9 @@
 "Error while sharing" => "Virhe jaettaessa",
 "Error while unsharing" => "Virhe jakoa peruttaessa",
 "Error while changing permissions" => "Virhe oikeuksia muuttaessa",
+"Shared with you and the group {group} by {owner}" => "Jaettu sinun ja ryhmÃ¤n {group} kanssa kÃ¤yttÃ¤jÃ¤n {owner} toimesta",
+"Shared with you by {owner}" => "Jaettu kanssasi kÃ¤yttÃ¤jÃ¤n {owner} toimesta",
+"Share with" => "Jaa",
 "Share with link" => "Jaa linkillÃ¤",
 "Password protect" => "Suojaa salasanalla",
 "Password" => "Salasana",
@@ -86,25 +110,6 @@
 "Database tablespace" => "Tietokannan taulukkotila",
 "Database host" => "Tietokantapalvelin",
 "Finish setup" => "Viimeistele asennus",
-"Sunday" => "Sunnuntai",
-"Monday" => "Maanantai",
-"Tuesday" => "Tiistai",
-"Wednesday" => "Keskiviikko",
-"Thursday" => "Torstai",
-"Friday" => "Perjantai",
-"Saturday" => "Lauantai",
-"January" => "Tammikuu",
-"February" => "Helmikuu",
-"March" => "Maaliskuu",
-"April" => "Huhtikuu",
-"May" => "Toukokuu",
-"June" => "KesÃ¤kuu",
-"July" => "HeinÃ¤kuu",
-"August" => "Elokuu",
-"September" => "Syyskuu",
-"October" => "Lokakuu",
-"November" => "Marraskuu",
-"December" => "Joulukuu",
 "web services under your control" => "verkkopalvelut hallinnassasi",
 "Log out" => "Kirjaudu ulos",
 "Automatic logon rejected!" => "Automaattinen sisÃ¤Ã¤nkirjautuminen hylÃ¤ttiin!",
@@ -115,8 +120,5 @@
 "Log in" => "Kirjaudu sisÃ¤Ã¤n",
 "prev" => "edellinen",
 "next" => "seuraava",
-"Updating ownCloud to version %s, this may take a while." => "PÃ¤ivitetÃ¤Ã¤n ownCloud versioon %s, tÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken.",
-"Security Warning!" => "Turvallisuusvaroitus!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vahvista salasanasi. <br/>TurvallisuussyistÃ¤ sinulta saatetaan ajoittain kysyÃ¤ salasanasi uudelleen.",
-"Verify" => "Vahvista"
+"Updating ownCloud to version %s, this may take a while." => "PÃ¤ivitetÃ¤Ã¤n ownCloud versioon %s, tÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken."
 );
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 8cbf5f45adb101288df64df5fbfdae01ab70448c..46aac990bd2add4e5bd759dba93eab0b44eafd87 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Erreur lors de l'ajout de %s aux favoris.",
 "No categories selected for deletion." => "Aucune catÃ©gorie sÃ©lectionnÃ©e pour suppression",
 "Error removing %s from favorites." => "Erreur lors de la suppression de %s des favoris.",
+"Sunday" => "Dimanche",
+"Monday" => "Lundi",
+"Tuesday" => "Mardi",
+"Wednesday" => "Mercredi",
+"Thursday" => "Jeudi",
+"Friday" => "Vendredi",
+"Saturday" => "Samedi",
+"January" => "janvier",
+"February" => "fÃ©vrier",
+"March" => "mars",
+"April" => "avril",
+"May" => "mai",
+"June" => "juin",
+"July" => "juillet",
+"August" => "aoÃ»t",
+"September" => "septembre",
+"October" => "octobre",
+"November" => "novembre",
+"December" => "dÃ©cembre",
 "Settings" => "ParamÃ¨tres",
 "seconds ago" => "il y a quelques secondes",
 "1 minute ago" => "il y a une minute",
@@ -63,6 +82,8 @@
 "Error setting expiration date" => "Erreur lors de la spÃ©cification de la date d'expiration",
 "Sending ..." => "En cours d'envoi ...",
 "Email sent" => "Email envoyÃ©",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "La mise Ã  jour a Ã©chouÃ©. Veuillez signaler ce problÃ¨me Ã  la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communautÃ© ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "La mise Ã  jour a rÃ©ussi. Vous Ãªtes redirigÃ© maintenant vers ownCloud.",
 "ownCloud password reset" => "RÃ©initialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour rÃ©initialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour rÃ©initialiser votre mot de passe.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Tablespaces de la base de donnÃ©es",
 "Database host" => "Serveur de la base de donnÃ©es",
 "Finish setup" => "Terminer l'installation",
-"Sunday" => "Dimanche",
-"Monday" => "Lundi",
-"Tuesday" => "Mardi",
-"Wednesday" => "Mercredi",
-"Thursday" => "Jeudi",
-"Friday" => "Vendredi",
-"Saturday" => "Samedi",
-"January" => "janvier",
-"February" => "fÃ©vrier",
-"March" => "mars",
-"April" => "avril",
-"May" => "mai",
-"June" => "juin",
-"July" => "juillet",
-"August" => "aoÃ»t",
-"September" => "septembre",
-"October" => "octobre",
-"November" => "novembre",
-"December" => "dÃ©cembre",
 "web services under your control" => "services web sous votre contrÃ´le",
 "Log out" => "Se dÃ©connecter",
 "Automatic logon rejected!" => "Connexion automatique rejetÃ©e !",
@@ -127,8 +129,5 @@
 "Log in" => "Connexion",
 "prev" => "prÃ©cÃ©dent",
 "next" => "suivant",
-"Updating ownCloud to version %s, this may take a while." => "Mise Ã  jour en cours d'ownCloud vers la version %s, cela peut prendre du temps.",
-"Security Warning!" => "Alerte de sÃ©curitÃ© !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Veuillez vÃ©rifier votre mot de passe. <br/>Par sÃ©curitÃ© il vous sera occasionnellement demandÃ© d'entrer votre mot de passe de nouveau.",
-"Verify" => "VÃ©rification"
+"Updating ownCloud to version %s, this may take a while." => "Mise Ã  jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
 );
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index bdd1293113cc684dfc352f71f5d89d35a00d309a..a45d45d908cfa70d6463483fb7b7a9d9c12c9554 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Produciuse un erro ao engadir %s aos favoritos.",
 "No categories selected for deletion." => "Non hai categorÃas seleccionadas para eliminar.",
 "Error removing %s from favorites." => "Produciuse un erro ao eliminar %s dos favoritos.",
+"Sunday" => "Domingo",
+"Monday" => "Luns",
+"Tuesday" => "Martes",
+"Wednesday" => "MÃ©rcores",
+"Thursday" => "Xoves",
+"Friday" => "Venres",
+"Saturday" => "SÃ¡bado",
+"January" => "xaneiro",
+"February" => "febreiro",
+"March" => "marzo",
+"April" => "abril",
+"May" => "maio",
+"June" => "xuÃ±o",
+"July" => "xullo",
+"August" => "agosto",
+"September" => "setembro",
+"October" => "outubro",
+"November" => "novembro",
+"December" => "decembro",
 "Settings" => "ConfiguraciÃ³ns",
 "seconds ago" => "segundos atrÃ¡s",
 "1 minute ago" => "hai 1 minuto",
@@ -98,25 +117,6 @@
 "Database tablespace" => "TÃ¡boa de espazos da base de datos",
 "Database host" => "Servidor da base de datos",
 "Finish setup" => "Rematar a configuraciÃ³n",
-"Sunday" => "Domingo",
-"Monday" => "Luns",
-"Tuesday" => "Martes",
-"Wednesday" => "MÃ©rcores",
-"Thursday" => "Xoves",
-"Friday" => "Venres",
-"Saturday" => "SÃ¡bado",
-"January" => "xaneiro",
-"February" => "febreiro",
-"March" => "marzo",
-"April" => "abril",
-"May" => "maio",
-"June" => "xuÃ±o",
-"July" => "xullo",
-"August" => "agosto",
-"September" => "setembro",
-"October" => "outubro",
-"November" => "novembro",
-"December" => "decembro",
 "web services under your control" => "servizos web baixo o seu control",
 "Log out" => "Desconectar",
 "Automatic logon rejected!" => "Rexeitouse a entrada automÃ¡tica",
@@ -127,8 +127,5 @@
 "Log in" => "Conectar",
 "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.",
-"Security Warning!" => "Advertencia de seguranza",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifique o seu contrasinal.<br/>Por motivos de seguranza pode que ocasionalmente se lle pregunte de novo polo seu contrasinal.",
-"Verify" => "Verificar"
+"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 bb6ac48dd9263d49fb1720e5f51f0827852acc00..88da2e8ddea8146e727f8028be3e9238e1b98d21 100644
--- a/core/l10n/he.php
+++ b/core/l10n/he.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "××™×¨×¢×” ×©×’×™××” ×‘×¢×ª ×”×•×¡×¤×ª %s ×œ×ž×•×¢×“×¤×™×.",
 "No categories selected for deletion." => "×œ× × ×‘×—×¨×• ×§×˜×’×•×¨×™×•×ª ×œ×ž×—×™×§×”",
 "Error removing %s from favorites." => "×©×’×™××” ×‘×”×¡×¨×ª %s ×ž×”×ž×•×¢×“×¤×™×.",
+"Sunday" => "×™×•× ×¨××©×•×Ÿ",
+"Monday" => "×™×•× ×©× ×™",
+"Tuesday" => "×™×•× ×©×œ×™×©×™",
+"Wednesday" => "×™×•× ×¨×‘×™×¢×™",
+"Thursday" => "×™×•× ×—×ž×™×©×™",
+"Friday" => "×™×•× ×©×™×©×™",
+"Saturday" => "×©×‘×ª",
+"January" => "×™× ×•××¨",
+"February" => "×¤×‘×¨×•××¨",
+"March" => "×ž×¨×¥",
+"April" => "××¤×¨×™×œ",
+"May" => "×ž××™",
+"June" => "×™×•× ×™",
+"July" => "×™×•×œ×™",
+"August" => "××•×’×•×¡×˜",
+"September" => "×¡×¤×˜×ž×‘×¨",
+"October" => "××•×§×˜×•×‘×¨",
+"November" => "× ×•×‘×ž×‘×¨",
+"December" => "×“×¦×ž×‘×¨",
 "Settings" => "×”×’×“×¨×•×ª",
 "seconds ago" => "×©× ×™×•×ª",
 "1 minute ago" => "×œ×¤× ×™ ×“×§×” ××—×ª",
@@ -98,25 +117,6 @@
 "Database tablespace" => "×ž×¨×—×‘ ×”×›×ª×•×‘×•×ª ×©×œ ×ž×¡×“ ×”× ×ª×•× ×™×",
 "Database host" => "×©×¨×ª ×‘×¡×™×¡ × ×ª×•× ×™×",
 "Finish setup" => "×¡×™×•× ×”×ª×§× ×”",
-"Sunday" => "×™×•× ×¨××©×•×Ÿ",
-"Monday" => "×™×•× ×©× ×™",
-"Tuesday" => "×™×•× ×©×œ×™×©×™",
-"Wednesday" => "×™×•× ×¨×‘×™×¢×™",
-"Thursday" => "×™×•× ×—×ž×™×©×™",
-"Friday" => "×™×•× ×©×™×©×™",
-"Saturday" => "×©×‘×ª",
-"January" => "×™× ×•××¨",
-"February" => "×¤×‘×¨×•××¨",
-"March" => "×ž×¨×¥",
-"April" => "××¤×¨×™×œ",
-"May" => "×ž××™",
-"June" => "×™×•× ×™",
-"July" => "×™×•×œ×™",
-"August" => "××•×’×•×¡×˜",
-"September" => "×¡×¤×˜×ž×‘×¨",
-"October" => "××•×§×˜×•×‘×¨",
-"November" => "× ×•×‘×ž×‘×¨",
-"December" => "×“×¦×ž×‘×¨",
 "web services under your control" => "×©×™×¨×•×ª×™ ×¨×©×ª ×‘×©×œ×™×˜×ª×š",
 "Log out" => "×”×ª× ×ª×§×•×ª",
 "Automatic logon rejected!" => "×‘×§×©×ª ×”×›× ×™×¡×” ×”××•×˜×•×ž×˜×™×ª × ×“×—×ª×”!",
@@ -127,8 +127,5 @@
 "Log in" => "×›× ×™×¡×”",
 "prev" => "×”×§×•×“×",
 "next" => "×”×‘×",
-"Updating ownCloud to version %s, this may take a while." => "×ž×¢×“×›×Ÿ ××ª ownCloud ××œ ×’×¨×¡× %s, ×–×” ×¢×œ×•×œ ×œ×§×—×ª ×–×ž×Ÿ ×ž×”.",
-"Security Warning!" => "××–×”×¨×ª ××‘×˜×—×”!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "× × ×œ××ž×ª ××ª ×”×¡×¡×ž×” ×©×œ×š. <br/>×ž×˜×¢×ž×™ ××‘×˜×—×” ×™×ª×›×Ÿ ×©×ª×•×¤×™×¢ ×‘×§×©×” ×œ×”×–×™×Ÿ ××ª ×”×¡×¡×ž×” ×©×•×‘.",
-"Verify" => "××™×ž×•×ª"
+"Updating ownCloud to version %s, this may take a while." => "×ž×¢×“×›×Ÿ ××ª ownCloud ××œ ×’×¨×¡× %s, ×–×” ×¢×œ×•×œ ×œ×§×—×ª ×–×ž×Ÿ ×ž×”."
 );
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index 43dbbe51ae0c02aa37623f24fac81829a134e8e7..32e3779ee4b6f3425f7629d02705b287e6787c12 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -2,6 +2,25 @@
 "No category to add?" => "Nemate kategorija koje moÅ¾ete dodati?",
 "This category already exists: " => "Ova kategorija veÄ‡ postoji: ",
 "No categories selected for deletion." => "Nema odabranih kategorija za brisanje.",
+"Sunday" => "nedelja",
+"Monday" => "ponedeljak",
+"Tuesday" => "utorak",
+"Wednesday" => "srijeda",
+"Thursday" => "Äetvrtak",
+"Friday" => "petak",
+"Saturday" => "subota",
+"January" => "SijeÄanj",
+"February" => "VeljaÄa",
+"March" => "OÅ¾ujak",
+"April" => "Travanj",
+"May" => "Svibanj",
+"June" => "Lipanj",
+"July" => "Srpanj",
+"August" => "Kolovoz",
+"September" => "Rujan",
+"October" => "Listopad",
+"November" => "Studeni",
+"December" => "Prosinac",
 "Settings" => "Postavke",
 "seconds ago" => "sekundi prije",
 "today" => "danas",
@@ -67,25 +86,6 @@
 "Database tablespace" => "Database tablespace",
 "Database host" => "PosluÅ¾itelj baze podataka",
 "Finish setup" => "ZavrÅ¡i postavljanje",
-"Sunday" => "nedelja",
-"Monday" => "ponedeljak",
-"Tuesday" => "utorak",
-"Wednesday" => "srijeda",
-"Thursday" => "Äetvrtak",
-"Friday" => "petak",
-"Saturday" => "subota",
-"January" => "SijeÄanj",
-"February" => "VeljaÄa",
-"March" => "OÅ¾ujak",
-"April" => "Travanj",
-"May" => "Svibanj",
-"June" => "Lipanj",
-"July" => "Srpanj",
-"August" => "Kolovoz",
-"September" => "Rujan",
-"October" => "Listopad",
-"November" => "Studeni",
-"December" => "Prosinac",
 "web services under your control" => "web usluge pod vaÅ¡om kontrolom",
 "Log out" => "Odjava",
 "Lost your password?" => "Izgubili ste lozinku?",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index fa02064f3d20ef0a4c0a0f54124455a9e77325e3..e03c6af27f59d727166cb80bc2d5546b39ef749e 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Nem sikerÃ¼lt a kedvencekhez adni ezt: %s",
 "No categories selected for deletion." => "Nincs tÃ¶rlÃ©sre jelÃ¶lt kategÃ³ria",
 "Error removing %s from favorites." => "Nem sikerÃ¼lt a kedvencekbÅ‘l tÃ¶rÃ¶lni ezt: %s",
+"Sunday" => "vasÃ¡rnap",
+"Monday" => "hÃ©tfÅ‘",
+"Tuesday" => "kedd",
+"Wednesday" => "szerda",
+"Thursday" => "csÃ¼tÃ¶rtÃ¶k",
+"Friday" => "pÃ©ntek",
+"Saturday" => "szombat",
+"January" => "januÃ¡r",
+"February" => "februÃ¡r",
+"March" => "mÃ¡rcius",
+"April" => "Ã¡prilis",
+"May" => "mÃ¡jus",
+"June" => "jÃºnius",
+"July" => "jÃºlius",
+"August" => "augusztus",
+"September" => "szeptember",
+"October" => "oktÃ³ber",
+"November" => "november",
+"December" => "december",
 "Settings" => "BeÃ¡llÃtÃ¡sok",
 "seconds ago" => "pÃ¡r mÃ¡sodperce",
 "1 minute ago" => "1 perce",
@@ -42,7 +61,7 @@
 "Share with" => "Kivel osztom meg",
 "Share with link" => "Link megadÃ¡sÃ¡val osztom meg",
 "Password protect" => "JelszÃ³val is vÃ©dem",
-"Password" => "JelszÃ³ (tetszÅ‘leges)",
+"Password" => "JelszÃ³",
 "Email link to person" => "Email cÃmre kÃ¼ldjÃ¼k el",
 "Send" => "KÃ¼ldjÃ¼k el",
 "Set expiration date" => "Legyen lejÃ¡rati idÅ‘",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Az adatbÃ¡zis tÃ¡blÃ¡zattÃ©r (tablespace)",
 "Database host" => "AdatbÃ¡zis szerver",
 "Finish setup" => "A beÃ¡llÃtÃ¡sok befejezÃ©se",
-"Sunday" => "vasÃ¡rnap",
-"Monday" => "hÃ©tfÅ‘",
-"Tuesday" => "kedd",
-"Wednesday" => "szerda",
-"Thursday" => "csÃ¼tÃ¶rtÃ¶k",
-"Friday" => "pÃ©ntek",
-"Saturday" => "szombat",
-"January" => "januÃ¡r",
-"February" => "februÃ¡r",
-"March" => "mÃ¡rcius",
-"April" => "Ã¡prilis",
-"May" => "mÃ¡jus",
-"June" => "jÃºnius",
-"July" => "jÃºlius",
-"August" => "augusztus",
-"September" => "szeptember",
-"October" => "oktÃ³ber",
-"November" => "november",
-"December" => "december",
 "web services under your control" => "webszolgÃ¡ltatÃ¡sok sajÃ¡t kÃ©zben",
 "Log out" => "KilÃ©pÃ©s",
 "Automatic logon rejected!" => "Az automatikus bejelentkezÃ©s sikertelen!",
@@ -127,7 +127,5 @@
 "Log in" => "BejelentkezÃ©s",
 "prev" => "elÅ‘zÅ‘",
 "next" => "kÃ¶vetkezÅ‘",
-"Security Warning!" => "BiztonsÃ¡gi figyelmeztetÃ©s!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "KÃ©rjÃ¼k Ãrja be a jelszavÃ¡t! <br/>BiztonsÃ¡gi okokbÃ³l nÃ©ha a bejelentkezÃ©st kÃ¶vetÅ‘en is ellenÅ‘rzÃ©skÃ©ppen meg kell adnia a jelszavÃ¡t.",
-"Verify" => "EllenÅ‘rzÃ©s"
+"Updating ownCloud to version %s, this may take a while." => "Owncloud frissÃtÃ©s a %s verziÃ³ra folyamatban. Kis tÃ¼relmet."
 );
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
index d614f8381af07f6754a685cae772952784ebbb83..08f283450f8e1da01cf55f2efbfeb1931b830824 100644
--- a/core/l10n/ia.php
+++ b/core/l10n/ia.php
@@ -1,5 +1,24 @@
 <?php $TRANSLATIONS = array(
 "This category already exists: " => "Iste categoria jam existe:",
+"Sunday" => "Dominica",
+"Monday" => "Lunedi",
+"Tuesday" => "Martedi",
+"Wednesday" => "Mercuridi",
+"Thursday" => "Jovedi",
+"Friday" => "Venerdi",
+"Saturday" => "Sabbato",
+"January" => "januario",
+"February" => "Februario",
+"March" => "Martio",
+"April" => "April",
+"May" => "Mai",
+"June" => "Junio",
+"July" => "Julio",
+"August" => "Augusto",
+"September" => "Septembre",
+"October" => "Octobre",
+"November" => "Novembre",
+"December" => "Decembre",
 "Settings" => "Configurationes",
 "Cancel" => "Cancellar",
 "Password" => "Contrasigno",
@@ -28,25 +47,6 @@
 "Database password" => "Contrasigno de base de datos",
 "Database name" => "Nomine de base de datos",
 "Database host" => "Hospite de base de datos",
-"Sunday" => "Dominica",
-"Monday" => "Lunedi",
-"Tuesday" => "Martedi",
-"Wednesday" => "Mercuridi",
-"Thursday" => "Jovedi",
-"Friday" => "Venerdi",
-"Saturday" => "Sabbato",
-"January" => "januario",
-"February" => "Februario",
-"March" => "Martio",
-"April" => "April",
-"May" => "Mai",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Augusto",
-"September" => "Septembre",
-"October" => "Octobre",
-"November" => "Novembre",
-"December" => "Decembre",
 "web services under your control" => "servicios web sub tu controlo",
 "Log out" => "Clauder le session",
 "Lost your password?" => "Tu perdeva le contrasigno?",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index d0ba6c694fb3df5cc6c3e9c8441693f83690ae78..2c66ea8ce3d4664c07e4652d2abad4e8f3bbfe4c 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -2,6 +2,25 @@
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
 "This category already exists: " => "Kategori ini sudah ada:",
 "No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
+"Sunday" => "minggu",
+"Monday" => "senin",
+"Tuesday" => "selasa",
+"Wednesday" => "rabu",
+"Thursday" => "kamis",
+"Friday" => "jumat",
+"Saturday" => "sabtu",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Maret",
+"April" => "April",
+"May" => "Mei",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "Agustus",
+"September" => "September",
+"October" => "Oktober",
+"November" => "Nopember",
+"December" => "Desember",
 "Settings" => "Setelan",
 "seconds ago" => "beberapa detik yang lalu",
 "1 minute ago" => "1 menit lalu",
@@ -73,25 +92,6 @@
 "Database tablespace" => "tablespace basis data",
 "Database host" => "Host database",
 "Finish setup" => "Selesaikan instalasi",
-"Sunday" => "minggu",
-"Monday" => "senin",
-"Tuesday" => "selasa",
-"Wednesday" => "rabu",
-"Thursday" => "kamis",
-"Friday" => "jumat",
-"Saturday" => "sabtu",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Maret",
-"April" => "April",
-"May" => "Mei",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Agustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "Nopember",
-"December" => "Desember",
 "web services under your control" => "web service dibawah kontrol anda",
 "Log out" => "Keluar",
 "Automatic logon rejected!" => "login otomatis ditolak!",
@@ -101,8 +101,5 @@
 "remember" => "selalu login",
 "Log in" => "Masuk",
 "prev" => "sebelum",
-"next" => "selanjutnya",
-"Security Warning!" => "peringatan keamanan!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi.",
-"Verify" => "periksa kembali"
+"next" => "selanjutnya"
 );
diff --git a/core/l10n/is.php b/core/l10n/is.php
index 0b2b2ce3e9a878f36351cc19edde43552128c6cc..6df2573100e59f41c370da65e12d367613e44646 100644
--- a/core/l10n/is.php
+++ b/core/l10n/is.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Villa viÃ° aÃ° bÃ¦ta %s viÃ° eftirlÃ¦ti.",
 "No categories selected for deletion." => "Enginn flokkur valinn til eyÃ°ingar.",
 "Error removing %s from favorites." => "Villa viÃ° aÃ° fjarlÃ¦gja %s Ãºr eftirlÃ¦ti.",
+"Sunday" => "Sunnudagur",
+"Monday" => "MÃ¡nudagur",
+"Tuesday" => "ÃžriÃ°judagur",
+"Wednesday" => "MiÃ°vikudagur",
+"Thursday" => "Fimmtudagur",
+"Friday" => "FÃ¶studagur",
+"Saturday" => "Laugardagur",
+"January" => "JanÃºar",
+"February" => "FebrÃºar",
+"March" => "Mars",
+"April" => "AprÃl",
+"May" => "MaÃ",
+"June" => "JÃºnÃ",
+"July" => "JÃºlÃ",
+"August" => "ÃgÃºst",
+"September" => "September",
+"October" => "OktÃ³ber",
+"November" => "NÃ³vember",
+"December" => "Desember",
 "Settings" => "Stillingar",
 "seconds ago" => "sek sÃÃ°an",
 "1 minute ago" => "1 min sÃÃ°an",
@@ -98,25 +117,6 @@
 "Database tablespace" => "TÃ¶flusvÃ¦Ã°i gagnagrunns",
 "Database host" => "NetÃ¾jÃ³nn gagnagrunns",
 "Finish setup" => "Virkja uppsetningu",
-"Sunday" => "Sunnudagur",
-"Monday" => "MÃ¡nudagur",
-"Tuesday" => "ÃžriÃ°judagur",
-"Wednesday" => "MiÃ°vikudagur",
-"Thursday" => "Fimmtudagur",
-"Friday" => "FÃ¶studagur",
-"Saturday" => "Laugardagur",
-"January" => "JanÃºar",
-"February" => "FebrÃºar",
-"March" => "Mars",
-"April" => "AprÃl",
-"May" => "MaÃ",
-"June" => "JÃºnÃ",
-"July" => "JÃºlÃ",
-"August" => "ÃgÃºst",
-"September" => "September",
-"October" => "OktÃ³ber",
-"November" => "NÃ³vember",
-"December" => "Desember",
 "web services under your control" => "vefÃ¾jÃ³nusta undir Ã¾inni stjÃ³rn",
 "Log out" => "ÃštskrÃ¡",
 "Automatic logon rejected!" => "SjÃ¡lfvirkri innskrÃ¡ningu hafnaÃ°!",
@@ -127,8 +127,5 @@
 "Log in" => "<strong>SkrÃ¡ inn</strong>",
 "prev" => "fyrra",
 "next" => "nÃ¦sta",
-"Updating ownCloud to version %s, this may take a while." => "UppfÃ¦ri ownCloud Ã ÃºtgÃ¡fu %s, Ã¾aÃ° gÃ¦ti tekiÃ° smÃ¡ stund.",
-"Security Warning!" => "Ã–ryggis aÃ°vÃ¶run!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vinsamlegast staÃ°festu lykilorÃ°iÃ° Ã¾itt.<br/>Ã Ã¶ryggisskyni munum viÃ° biÃ°ja Ã¾ig um aÃ° skipta um lykilorÃ° af og til.",
-"Verify" => "StaÃ°festa"
+"Updating ownCloud to version %s, this may take a while." => "UppfÃ¦ri ownCloud Ã ÃºtgÃ¡fu %s, Ã¾aÃ° gÃ¦ti tekiÃ° smÃ¡ stund."
 );
diff --git a/core/l10n/it.php b/core/l10n/it.php
index d868150346aadc63035b00d82c3c894a6bbeff09..88749320d5b44082a590ad00c7382bd5ce75a69e 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Errore durante l'aggiunta di %s ai preferiti.",
 "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
 "Error removing %s from favorites." => "Errore durante la rimozione di %s dai preferiti.",
+"Sunday" => "Domenica",
+"Monday" => "LunedÃ¬",
+"Tuesday" => "MartedÃ¬",
+"Wednesday" => "MercoledÃ¬",
+"Thursday" => "GiovedÃ¬",
+"Friday" => "VenerdÃ¬",
+"Saturday" => "Sabato",
+"January" => "Gennaio",
+"February" => "Febbraio",
+"March" => "Marzo",
+"April" => "Aprile",
+"May" => "Maggio",
+"June" => "Giugno",
+"July" => "Luglio",
+"August" => "Agosto",
+"September" => "Settembre",
+"October" => "Ottobre",
+"November" => "Novembre",
+"December" => "Dicembre",
 "Settings" => "Impostazioni",
 "seconds ago" => "secondi fa",
 "1 minute ago" => "Un minuto fa",
@@ -63,6 +82,8 @@
 "Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
 "Sending ..." => "Invio in corso...",
 "Email sent" => "Messaggio inviato",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "L'aggiornamento non Ã¨ riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitÃ  di ownCloud</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento Ã¨ stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
 "ownCloud password reset" => "Ripristino password di ownCloud",
 "Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
 "You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Spazio delle tabelle del database",
 "Database host" => "Host del database",
 "Finish setup" => "Termina la configurazione",
-"Sunday" => "Domenica",
-"Monday" => "LunedÃ¬",
-"Tuesday" => "MartedÃ¬",
-"Wednesday" => "MercoledÃ¬",
-"Thursday" => "GiovedÃ¬",
-"Friday" => "VenerdÃ¬",
-"Saturday" => "Sabato",
-"January" => "Gennaio",
-"February" => "Febbraio",
-"March" => "Marzo",
-"April" => "Aprile",
-"May" => "Maggio",
-"June" => "Giugno",
-"July" => "Luglio",
-"August" => "Agosto",
-"September" => "Settembre",
-"October" => "Ottobre",
-"November" => "Novembre",
-"December" => "Dicembre",
 "web services under your control" => "servizi web nelle tue mani",
 "Log out" => "Esci",
 "Automatic logon rejected!" => "Accesso automatico rifiutato.",
@@ -127,8 +129,5 @@
 "Log in" => "Accedi",
 "prev" => "precedente",
 "next" => "successivo",
-"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo.",
-"Security Warning!" => "Avviso di sicurezza",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifica la tua password.<br/>Per motivi di sicurezza, potresti ricevere una richiesta di digitare nuovamente la password.",
-"Verify" => "Verifica"
+"Updating ownCloud to version %s, this may take a while." => "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo."
 );
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5efbe05bc56ed981ecf66db33dad826b7e46b882..7995147f06250239c40a342228e8c392ed44399e 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "ãŠæ°—ã«å…¥ã‚Šã« %s ã‚’è¿½åŠ ã‚¨ãƒ©ãƒ¼",
 "No categories selected for deletion." => "å‰Šé™¤ã™ã‚‹ã‚«ãƒ†ã‚´ãƒªãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚",
 "Error removing %s from favorites." => "ãŠæ°—ã«å…¥ã‚Šã‹ã‚‰ %s ã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼",
+"Sunday" => "æ—¥",
+"Monday" => "æœˆ",
+"Tuesday" => "ç«",
+"Wednesday" => "æ°´",
+"Thursday" => "æœ¨",
+"Friday" => "é‡‘",
+"Saturday" => "åœŸ",
+"January" => "1æœˆ",
+"February" => "2æœˆ",
+"March" => "3æœˆ",
+"April" => "4æœˆ",
+"May" => "5æœˆ",
+"June" => "6æœˆ",
+"July" => "7æœˆ",
+"August" => "8æœˆ",
+"September" => "9æœˆ",
+"October" => "10æœˆ",
+"November" => "11æœˆ",
+"December" => "12æœˆ",
 "Settings" => "è¨å®š",
 "seconds ago" => "ç§’å‰",
 "1 minute ago" => "1 åˆ†å‰",
@@ -63,6 +82,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 community</a> ã«ãƒ¬ãƒãƒ¼ãƒˆã—ã¦ãã ã•ã„ã€‚",
+"The update was successful. Redirecting you to ownCloud now." => "æ›´æ–°ã«æˆåŠŸã—ã¾ã—ãŸã€‚ä»Šã™ãownCloudã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¾ã™ã€‚",
 "ownCloud password reset" => "ownCloudã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã—ã¾ã™",
 "Use the following link to reset your password: {link}" => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã™ã‚‹ã«ã¯æ¬¡ã®ãƒªãƒ³ã‚¯ã‚’ã‚¯ãƒªãƒƒã‚¯ã—ã¦ä¸‹ã•ã„: {link}",
 "You will receive a link to reset your password via Email." => "ãƒ¡ãƒ¼ãƒ«ã§ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã™ã‚‹ãƒªãƒ³ã‚¯ãŒå±Šãã¾ã™ã€‚",
@@ -98,25 +119,6 @@
 "Database tablespace" => "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®è¡¨é ˜åŸŸ",
 "Database host" => "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ›ã‚¹ãƒˆå",
 "Finish setup" => "ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’å®Œäº†ã—ã¾ã™",
-"Sunday" => "æ—¥",
-"Monday" => "æœˆ",
-"Tuesday" => "ç«",
-"Wednesday" => "æ°´",
-"Thursday" => "æœ¨",
-"Friday" => "é‡‘",
-"Saturday" => "åœŸ",
-"January" => "1æœˆ",
-"February" => "2æœˆ",
-"March" => "3æœˆ",
-"April" => "4æœˆ",
-"May" => "5æœˆ",
-"June" => "6æœˆ",
-"July" => "7æœˆ",
-"August" => "8æœˆ",
-"September" => "9æœˆ",
-"October" => "10æœˆ",
-"November" => "11æœˆ",
-"December" => "12æœˆ",
 "web services under your control" => "ç®¡ç†ä¸‹ã«ã‚ã‚‹ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹",
 "Log out" => "ãƒã‚°ã‚¢ã‚¦ãƒˆ",
 "Automatic logon rejected!" => "è‡ªå‹•ãƒã‚°ã‚¤ãƒ³ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸï¼",
@@ -127,8 +129,5 @@
 "Log in" => "ãƒã‚°ã‚¤ãƒ³",
 "prev" => "å‰",
 "next" => "æ¬¡",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æ›´æ–°ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ä¸‹ã•ã„ã€‚",
-"Security Warning!" => "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£è¦å‘Šï¼",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã®ç¢ºèª<br/>ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ä¸Šã®ç†ç”±ã«ã‚ˆã‚Šãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã®å†å…¥åŠ›ã‚’ãŠé¡˜ã„ã—ã¾ã™ã€‚",
-"Verify" => "ç¢ºèª"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æ›´æ–°ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ä¸‹ã•ã„ã€‚"
 );
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
index b002b42cb5900a5eec942b2184163eda988570e7..58771e080b33e9b9ed5d8ef6347525b85072588b 100644
--- a/core/l10n/ka_GE.php
+++ b/core/l10n/ka_GE.php
@@ -2,6 +2,25 @@
 "No category to add?" => "áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜áƒ áƒ“áƒáƒ¡áƒáƒ›áƒáƒ¢áƒ”áƒ‘áƒšáƒáƒ“?",
 "This category already exists: " => "áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜áƒ áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡",
 "No categories selected for deletion." => "áƒ¡áƒáƒ áƒ”áƒ“áƒáƒ¥áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒáƒ áƒ©áƒ”áƒ£áƒšáƒ˜ ",
+"Sunday" => "áƒ™áƒ•áƒ˜áƒ áƒ",
+"Monday" => "áƒáƒ áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
+"Tuesday" => "áƒ¡áƒáƒ›áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
+"Wednesday" => "áƒáƒ—áƒ®áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
+"Thursday" => "áƒ®áƒ£áƒ—áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
+"Friday" => "áƒžáƒáƒ áƒáƒ¡áƒ™áƒ”áƒ•áƒ˜",
+"Saturday" => "áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
+"January" => "áƒ˜áƒáƒœáƒ•áƒáƒ áƒ˜",
+"February" => "áƒ—áƒ”áƒ‘áƒ”áƒ áƒ•áƒáƒšáƒ˜",
+"March" => "áƒ›áƒáƒ áƒ¢áƒ˜",
+"April" => "áƒáƒžáƒ áƒ˜áƒšáƒ˜",
+"May" => "áƒ›áƒáƒ˜áƒ¡áƒ˜",
+"June" => "áƒ˜áƒ•áƒœáƒ˜áƒ¡áƒ˜",
+"July" => "áƒ˜áƒ•áƒšáƒ˜áƒ¡áƒ˜",
+"August" => "áƒáƒ’áƒ•áƒ˜áƒ¡áƒ¢áƒ",
+"September" => "áƒ¡áƒ”áƒ¥áƒ¢áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜",
+"October" => "áƒáƒ¥áƒ¢áƒáƒ›áƒ‘áƒ”áƒ áƒ˜",
+"November" => "áƒœáƒáƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜",
+"December" => "áƒ“áƒ”áƒ™áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜",
 "Settings" => "áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜",
 "seconds ago" => "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
 "1 minute ago" => "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ",
@@ -73,25 +92,6 @@
 "Database tablespace" => "áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒªáƒ®áƒ áƒ˜áƒšáƒ˜áƒ¡ áƒ–áƒáƒ›áƒ",
 "Database host" => "áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ°áƒáƒ¡áƒ¢áƒ˜",
 "Finish setup" => "áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ",
-"Sunday" => "áƒ™áƒ•áƒ˜áƒ áƒ",
-"Monday" => "áƒáƒ áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
-"Tuesday" => "áƒ¡áƒáƒ›áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
-"Wednesday" => "áƒáƒ—áƒ®áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
-"Thursday" => "áƒ®áƒ£áƒ—áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
-"Friday" => "áƒžáƒáƒ áƒáƒ¡áƒ™áƒ”áƒ•áƒ˜",
-"Saturday" => "áƒ¨áƒáƒ‘áƒáƒ—áƒ˜",
-"January" => "áƒ˜áƒáƒœáƒ•áƒáƒ áƒ˜",
-"February" => "áƒ—áƒ”áƒ‘áƒ”áƒ áƒ•áƒáƒšáƒ˜",
-"March" => "áƒ›áƒáƒ áƒ¢áƒ˜",
-"April" => "áƒáƒžáƒ áƒ˜áƒšáƒ˜",
-"May" => "áƒ›áƒáƒ˜áƒ¡áƒ˜",
-"June" => "áƒ˜áƒ•áƒœáƒ˜áƒ¡áƒ˜",
-"July" => "áƒ˜áƒ•áƒšáƒ˜áƒ¡áƒ˜",
-"August" => "áƒáƒ’áƒ•áƒ˜áƒ¡áƒ¢áƒ",
-"September" => "áƒ¡áƒ”áƒ¥áƒ¢áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜",
-"October" => "áƒáƒ¥áƒ¢áƒáƒ›áƒ‘áƒ”áƒ áƒ˜",
-"November" => "áƒœáƒáƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜",
-"December" => "áƒ“áƒ”áƒ™áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜",
 "web services under your control" => "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ˜áƒ¡ áƒ¥áƒ•áƒ”áƒ¨ áƒ›áƒ§áƒáƒ¤áƒ˜ áƒ•áƒ”áƒ‘ áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒ”áƒ‘áƒ˜",
 "Log out" => "áƒ’áƒáƒ›áƒáƒ¡áƒ•áƒšáƒ",
 "Automatic logon rejected!" => "áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒ˜ áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ˜áƒšáƒ˜áƒ!",
@@ -99,7 +99,5 @@
 "remember" => "áƒ“áƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ áƒ”áƒ‘áƒ",
 "Log in" => "áƒ¨áƒ”áƒ¡áƒ•áƒšáƒ",
 "prev" => "áƒ¬áƒ˜áƒœáƒ",
-"next" => "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜",
-"Security Warning!" => "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ!",
-"Verify" => "áƒ¨áƒ”áƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ"
+"next" => "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜"
 );
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 0faa19865f9eb13cc6aa08e5b6ddcad321c38ef6..5897b890ec542ca58f394ff0b52b269a03367706 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "ì±…ê°ˆí”¼ì— %sì„(ë¥¼) ì¶”ê°€í•  ìˆ˜ ì—†ì—ˆìŠµë‹ˆë‹¤.",
 "No categories selected for deletion." => "ì‚ì œí•  ë¶„ë¥˜ë¥¼ ì„ íƒí•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤.",
 "Error removing %s from favorites." => "ì±…ê°ˆí”¼ì—ì„œ %sì„(ë¥¼) ì‚ì œí•  ìˆ˜ ì—†ì—ˆìŠµë‹ˆë‹¤.",
+"Sunday" => "ì¼ìš”ì¼",
+"Monday" => "ì›”ìš”ì¼",
+"Tuesday" => "í™”ìš”ì¼",
+"Wednesday" => "ìˆ˜ìš”ì¼",
+"Thursday" => "ëª©ìš”ì¼",
+"Friday" => "ê¸ˆìš”ì¼",
+"Saturday" => "í† ìš”ì¼",
+"January" => "1ì›”",
+"February" => "2ì›”",
+"March" => "3ì›”",
+"April" => "4ì›”",
+"May" => "5ì›”",
+"June" => "6ì›”",
+"July" => "7ì›”",
+"August" => "8ì›”",
+"September" => "9ì›”",
+"October" => "10ì›”",
+"November" => "11ì›”",
+"December" => "12ì›”",
 "Settings" => "ì„¤ì •",
 "seconds ago" => "ì´ˆ ì „",
 "1 minute ago" => "1ë¶„ ì „",
@@ -98,25 +117,6 @@
 "Database tablespace" => "ë°ì´í„°ë² ì´ìŠ¤ í…Œì´ë¸” ê³µê°„",
 "Database host" => "ë°ì´í„°ë² ì´ìŠ¤ í˜¸ìŠ¤íŠ¸",
 "Finish setup" => "ì„¤ì¹˜ ì™„ë£Œ",
-"Sunday" => "ì¼ìš”ì¼",
-"Monday" => "ì›”ìš”ì¼",
-"Tuesday" => "í™”ìš”ì¼",
-"Wednesday" => "ìˆ˜ìš”ì¼",
-"Thursday" => "ëª©ìš”ì¼",
-"Friday" => "ê¸ˆìš”ì¼",
-"Saturday" => "í† ìš”ì¼",
-"January" => "1ì›”",
-"February" => "2ì›”",
-"March" => "3ì›”",
-"April" => "4ì›”",
-"May" => "5ì›”",
-"June" => "6ì›”",
-"July" => "7ì›”",
-"August" => "8ì›”",
-"September" => "9ì›”",
-"October" => "10ì›”",
-"November" => "11ì›”",
-"December" => "12ì›”",
 "web services under your control" => "ë‚´ê°€ ê´€ë¦¬í•˜ëŠ” ì›¹ ì„œë¹„ìŠ¤",
 "Log out" => "ë¡œê·¸ì•„ì›ƒ",
 "Automatic logon rejected!" => "ìžë™ ë¡œê·¸ì¸ì´ ê±°ë¶€ë˜ì—ˆìŠµë‹ˆë‹¤!",
@@ -127,8 +127,5 @@
 "Log in" => "ë¡œê·¸ì¸",
 "prev" => "ì´ì „",
 "next" => "ë‹¤ìŒ",
-"Updating ownCloud to version %s, this may take a while." => "ownCloud ë¥¼ ë²„ì ¼ %së¡œ ì—…ë°ì´íŠ¸ í•˜ëŠ” ì¤‘, ì‹œê°„ì´ ì†Œìš”ë©ë‹ˆë‹¤.",
-"Security Warning!" => "ë³´ì•ˆ ê²½ê³ !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "ì•”í˜¸ë¥¼ í™•ì¸í•´ ì£¼ì‹ì‹œì˜¤.<br/>ë³´ì•ˆìƒì˜ ì´ìœ ë¡œ ì¢…ì¢… ì•”í˜¸ë¥¼ ë¬¼ì–´ë³¼ ê²ƒìž…ë‹ˆë‹¤.",
-"Verify" => "í™•ì¸"
+"Updating ownCloud to version %s, this may take a while." => "ownCloud ë¥¼ ë²„ì ¼ %së¡œ ì—…ë°ì´íŠ¸ í•˜ëŠ” ì¤‘, ì‹œê°„ì´ ì†Œìš”ë©ë‹ˆë‹¤."
 );
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index 407b8093a272b127c0c69e771c01c010b23a0f31..85d83d1f953e6aec207066cc232384b8cf572293 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -2,14 +2,44 @@
 "No category to add?" => "Keng Kategorie fir bÃ¤izesetzen?",
 "This category already exists: " => "Des Kategorie existÃ©iert schonn:",
 "No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze lÃ¤schen.",
+"Sunday" => "Sonndes",
+"Monday" => "MÃ©indes",
+"Tuesday" => "DÃ«nschdes",
+"Wednesday" => "MÃ«ttwoch",
+"Thursday" => "Donneschdes",
+"Friday" => "Freides",
+"Saturday" => "Samschdes",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "MÃ¤erz",
+"April" => "AbrÃ«ll",
+"May" => "Mee",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Dezember",
 "Settings" => "Astellungen",
+"1 hour ago" => "vrun 1 Stonn",
+"{hours} hours ago" => "vru {hours} Stonnen",
+"last month" => "LÃ¤schte Mount",
+"{months} months ago" => "vru {months} MÃ©int",
+"months ago" => "MÃ©int hier",
+"last year" => "LÃ¤scht Joer",
+"years ago" => "Joren hier",
+"Choose" => "Auswielen",
 "Cancel" => "Ofbriechen",
 "No" => "Nee",
 "Yes" => "Jo",
 "Ok" => "OK",
 "Error" => "Fehler",
 "Password" => "Passwuert",
+"Unshare" => "Net mÃ©i deelen",
 "create" => "erstellen",
+"delete" => "lÃ¤schen",
+"share" => "deelen",
 "ownCloud password reset" => "ownCloud Passwuert reset",
 "Use the following link to reset your password: {link}" => "Benotz folgende Link fir dÃ¤i Passwuert ze reseten: {link}",
 "You will receive a link to reset your password via Email." => "Du kriss en Link fir dÃ¤in Passwuert nei ze setzen via Email geschÃ©ckt.",
@@ -30,7 +60,7 @@
 "Add" => "BÃ¤isetzen",
 "Security Warning" => "SÃ©cherheets Warnung",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeÃ«n",
-"Advanced" => "Advanced",
+"Advanced" => "AvancÃ©iert",
 "Data folder" => "Daten Dossier",
 "Configure the database" => "Datebank konfigurÃ©ieren",
 "will be used" => "wÃ¤rt benotzt ginn",
@@ -40,25 +70,6 @@
 "Database tablespace" => "Datebank Tabelle-GrÃ©isst",
 "Database host" => "Datebank Server",
 "Finish setup" => "Installatioun ofschlÃ©issen",
-"Sunday" => "Sonndes",
-"Monday" => "MÃ©indes",
-"Tuesday" => "DÃ«nschdes",
-"Wednesday" => "MÃ«ttwoch",
-"Thursday" => "Donneschdes",
-"Friday" => "Freides",
-"Saturday" => "Samschdes",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "MÃ¤erz",
-"April" => "AbrÃ«ll",
-"May" => "Mee",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
 "web services under your control" => "Web Servicer Ã«nnert denger Kontroll",
 "Log out" => "Ausloggen",
 "Lost your password?" => "Passwuert vergiess?",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 19826b26c160797546a92fd498a3c7d224070b7c..040a5a7f7fcf63aac532bdb589da9445ffe1b65f 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -2,6 +2,25 @@
 "No category to add?" => "NepridÄ—site jokios kategorijos?",
 "This category already exists: " => "Tokia kategorija jau yra:",
 "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
+"Sunday" => "Sekmadienis",
+"Monday" => "Pirmadienis",
+"Tuesday" => "Antradienis",
+"Wednesday" => "TreÄiadienis",
+"Thursday" => "Ketvirtadienis",
+"Friday" => "Penktadienis",
+"Saturday" => "Å eÅ¡tadienis",
+"January" => "Sausis",
+"February" => "Vasaris",
+"March" => "Kovas",
+"April" => "Balandis",
+"May" => "GeguÅ¾Ä—",
+"June" => "BirÅ¾elis",
+"July" => "Liepa",
+"August" => "RugpjÅ«tis",
+"September" => "RugsÄ—jis",
+"October" => "Spalis",
+"November" => "Lapkritis",
+"December" => "Gruodis",
 "Settings" => "Nustatymai",
 "seconds ago" => "prieÅ¡ sekundÄ™",
 "1 minute ago" => "PrieÅ¡ 1 minutÄ™",
@@ -77,25 +96,6 @@
 "Database tablespace" => "DuomenÅ³ bazÄ—s loginis saugojimas",
 "Database host" => "DuomenÅ³ bazÄ—s serveris",
 "Finish setup" => "Baigti diegimÄ…",
-"Sunday" => "Sekmadienis",
-"Monday" => "Pirmadienis",
-"Tuesday" => "Antradienis",
-"Wednesday" => "TreÄiadienis",
-"Thursday" => "Ketvirtadienis",
-"Friday" => "Penktadienis",
-"Saturday" => "Å eÅ¡tadienis",
-"January" => "Sausis",
-"February" => "Vasaris",
-"March" => "Kovas",
-"April" => "Balandis",
-"May" => "GeguÅ¾Ä—",
-"June" => "BirÅ¾elis",
-"July" => "Liepa",
-"August" => "RugpjÅ«tis",
-"September" => "RugsÄ—jis",
-"October" => "Spalis",
-"November" => "Lapkritis",
-"December" => "Gruodis",
 "web services under your control" => "jÅ«sÅ³ valdomos web paslaugos",
 "Log out" => "Atsijungti",
 "Automatic logon rejected!" => "Automatinis prisijungimas atmestas!",
@@ -105,8 +105,5 @@
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
 "prev" => "atgal",
-"next" => "kitas",
-"Security Warning!" => "Saugumo praneÅ¡imas!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "PraÅ¡ome patvirtinti savo vartotojÄ….<br/>DÄ—l saugumo, slaptaÅ¾odÅ¾io patvirtinimas bus reikalaujamas Ä¯vesti kas kiek laiko.",
-"Verify" => "Patvirtinti"
+"next" => "kitas"
 );
diff --git a/core/l10n/lv.php b/core/l10n/lv.php
index 8a6dc033de655d1992a65051782bacba10398421..66866249e760cab50f563171c9502c7b5a10c083 100644
--- a/core/l10n/lv.php
+++ b/core/l10n/lv.php
@@ -1,5 +1,25 @@
 <?php $TRANSLATIONS = array(
+"Sunday" => "SvÄ“tdiena",
+"Monday" => "Pirmdiena",
+"Tuesday" => "Otrdiena",
+"Wednesday" => "TreÅ¡diena",
+"Thursday" => "Ceturtdiena",
+"Friday" => "Piektdiena",
+"Saturday" => "Sestdiena",
+"January" => "JanvÄris",
+"February" => "FebruÄris",
+"March" => "Marts",
+"April" => "AprÄ«lis",
+"May" => "Maijs",
+"June" => "JÅ«nijs",
+"July" => "JÅ«lijs",
+"August" => "Augusts",
+"September" => "Septembris",
+"October" => "Oktobris",
+"November" => "Novembris",
+"December" => "Decembris",
 "Settings" => "IestatÄ«jumi",
+"Cancel" => "Atcelt",
 "Error" => "KÄ¼Å«me",
 "Password" => "Parole",
 "Unshare" => "PÄrtraukt lÄ«dzdalÄ«Å¡anu",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index 94c9ee581b1527898ae5324b2c295ae26f47aa63..3a8991437baf44770a54cb651b5bcd82cdb91e90 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð´Ð¾Ð´Ð°Ð²Ð°ÑšÐµ %s Ð²Ð¾ Ð¾Ð¼Ð¸Ð»ÐµÐ½Ð¸.",
 "No categories selected for deletion." => "ÐÐµ Ðµ Ð¾Ð´Ð±Ñ€Ð°Ð½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° Ð·Ð° Ð±Ñ€Ð¸ÑˆÐµÑšÐµ.",
 "Error removing %s from favorites." => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð±Ñ€Ð¸ÑˆÐµÑšÐµ Ð½Ð° %s Ð¾Ð´ Ð¾Ð¼Ð¸Ð»ÐµÐ½Ð¸.",
+"Sunday" => "ÐÐµÐ´ÐµÐ»Ð°",
+"Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»Ð½Ð¸Ðº",
+"Tuesday" => "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº",
+"Wednesday" => "Ð¡Ñ€ÐµÐ´Ð°",
+"Thursday" => "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð¾Ðº",
+"Friday" => "ÐŸÐµÑ‚Ð¾Ðº",
+"Saturday" => "Ð¡Ð°Ð±Ð¾Ñ‚Ð°",
+"January" => "ÐˆÐ°Ð½ÑƒÐ°Ñ€Ð¸",
+"February" => "Ð¤ÐµÐ²Ñ€ÑƒÐ°Ñ€Ð¸",
+"March" => "ÐœÐ°Ñ€Ñ‚",
+"April" => "ÐÐ¿Ñ€Ð¸Ð»",
+"May" => "ÐœÐ°Ñ˜",
+"June" => "ÐˆÑƒÐ½Ð¸",
+"July" => "ÐˆÑƒÐ»Ð¸",
+"August" => "ÐÐ²Ð³ÑƒÑÑ‚",
+"September" => "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð²Ñ€Ð¸",
+"October" => "ÐžÐºÑ‚Ð¾Ð¼Ð²Ñ€Ð¸",
+"November" => "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸",
+"December" => "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸",
 "Settings" => "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐ¸",
 "seconds ago" => "Ð¿Ñ€ÐµÐ´ ÑÐµÐºÑƒÐ½Ð´Ð¸",
 "1 minute ago" => "Ð¿Ñ€ÐµÐ´ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Ð¢Ð°Ð±ÐµÐ»Ð° Ð²Ð¾ Ð±Ð°Ð·Ð°Ñ‚Ð° Ð½Ð° Ð¿Ð¾Ð´Ð°Ñ‚Ð¾Ñ†Ð¸",
 "Database host" => "Ð¡ÐµÑ€Ð²ÐµÑ€ ÑÐ¾ Ð±Ð°Ð·Ð°",
 "Finish setup" => "Ð—Ð°Ð²Ñ€ÑˆÐ¸ Ð³Ð¾ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐµÑ‚Ð¾",
-"Sunday" => "ÐÐµÐ´ÐµÐ»Ð°",
-"Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»Ð½Ð¸Ðº",
-"Tuesday" => "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº",
-"Wednesday" => "Ð¡Ñ€ÐµÐ´Ð°",
-"Thursday" => "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð¾Ðº",
-"Friday" => "ÐŸÐµÑ‚Ð¾Ðº",
-"Saturday" => "Ð¡Ð°Ð±Ð¾Ñ‚Ð°",
-"January" => "ÐˆÐ°Ð½ÑƒÐ°Ñ€Ð¸",
-"February" => "Ð¤ÐµÐ²Ñ€ÑƒÐ°Ñ€Ð¸",
-"March" => "ÐœÐ°Ñ€Ñ‚",
-"April" => "ÐÐ¿Ñ€Ð¸Ð»",
-"May" => "ÐœÐ°Ñ˜",
-"June" => "ÐˆÑƒÐ½Ð¸",
-"July" => "ÐˆÑƒÐ»Ð¸",
-"August" => "ÐÐ²Ð³ÑƒÑÑ‚",
-"September" => "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð²Ñ€Ð¸",
-"October" => "ÐžÐºÑ‚Ð¾Ð¼Ð²Ñ€Ð¸",
-"November" => "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸",
-"December" => "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸",
 "web services under your control" => "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ Ð’Ð°ÑˆÐ° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð°",
 "Log out" => "ÐžÐ´Ñ˜Ð°Ð²Ð°",
 "Automatic logon rejected!" => "ÐžÐ´Ð±Ð¸ÐµÐ½Ð° Ð°Ð²Ñ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ° Ð½Ð°Ñ˜Ð°Ð²Ð°!",
@@ -126,8 +126,5 @@
 "remember" => "Ð·Ð°Ð¿Ð°Ð¼Ñ‚Ð¸",
 "Log in" => "ÐÐ°Ñ˜Ð°Ð²Ð°",
 "prev" => "Ð¿Ñ€ÐµÑ‚Ñ…Ð¾Ð´Ð½Ð¾",
-"next" => "ÑÐ»ÐµÐ´Ð½Ð¾",
-"Security Warning!" => "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð¾ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ´ÑƒÐ²Ð°ÑšÐµ.",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ð’Ðµ Ð¼Ð¾Ð»Ð°Ð¼ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´ÐµÑ‚Ðµ Ñ˜Ð° Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°. <br />ÐžÐ´ Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð¸ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð¸ Ð¾Ð´ Ð²Ñ€ÐµÐ¼Ðµ Ð½Ð° Ð²Ñ€ÐµÐ¼Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ð¸Ð´Ðµ Ð¿Ð¾Ð±Ð°Ñ€Ð°Ð½Ð¾ Ð´Ð° Ñ˜Ð° Ð²Ð½ÐµÑÐµÑ‚Ðµ Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾.",
-"Verify" => "ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸"
+"next" => "ÑÐ»ÐµÐ´Ð½Ð¾"
 );
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index b08ccecf6167775b3d8322dced40d7447ba99d81..3eff044ac55c8c8593d4bece4567dbc508329d97 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -2,6 +2,25 @@
 "No category to add?" => "Tiada kategori untuk di tambah?",
 "This category already exists: " => "Kategori ini telah wujud",
 "No categories selected for deletion." => "tiada kategori dipilih untuk penghapusan",
+"Sunday" => "Ahad",
+"Monday" => "Isnin",
+"Tuesday" => "Selasa",
+"Wednesday" => "Rabu",
+"Thursday" => "Khamis",
+"Friday" => "Jumaat",
+"Saturday" => "Sabtu",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Mac",
+"April" => "April",
+"May" => "Mei",
+"June" => "Jun",
+"July" => "Julai",
+"August" => "Ogos",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Disember",
 "Settings" => "Tetapan",
 "Cancel" => "Batal",
 "No" => "Tidak",
@@ -38,25 +57,6 @@
 "Database name" => "Nama pangkalan data",
 "Database host" => "Hos pangkalan data",
 "Finish setup" => "Setup selesai",
-"Sunday" => "Ahad",
-"Monday" => "Isnin",
-"Tuesday" => "Selasa",
-"Wednesday" => "Rabu",
-"Thursday" => "Khamis",
-"Friday" => "Jumaat",
-"Saturday" => "Sabtu",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mac",
-"April" => "April",
-"May" => "Mei",
-"June" => "Jun",
-"July" => "Julai",
-"August" => "Ogos",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Disember",
 "web services under your control" => "Perkhidmatan web di bawah kawalan anda",
 "Log out" => "Log keluar",
 "Lost your password?" => "Hilang kata laluan?",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 45ee77e3c17310588a4e1614dca7e160d14f4490..a39e5d44bc44a4beacdaab5c866359822879e157 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -2,6 +2,25 @@
 "No category to add?" => "Ingen kategorier Ã¥ legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
 "No categories selected for deletion." => "Ingen kategorier merket for sletting.",
+"Sunday" => "SÃ¸ndag",
+"Monday" => "Mandag",
+"Tuesday" => "Tirsdag",
+"Wednesday" => "Onsdag",
+"Thursday" => "Torsdag",
+"Friday" => "Fredag",
+"Saturday" => "LÃ¸rdag",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Mars",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Desember",
 "Settings" => "Innstillinger",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minutt siden",
@@ -73,25 +92,6 @@
 "Database tablespace" => "Database tabellomrÃ¥de",
 "Database host" => "Databasevert",
 "Finish setup" => "FullfÃ¸r oppsetting",
-"Sunday" => "SÃ¸ndag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "LÃ¸rdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
 "web services under your control" => "nettjenester under din kontroll",
 "Log out" => "Logg ut",
 "Automatic logon rejected!" => "Automatisk pÃ¥logging avvist!",
@@ -101,7 +101,5 @@
 "remember" => "husk",
 "Log in" => "Logg inn",
 "prev" => "forrige",
-"next" => "neste",
-"Security Warning!" => "Sikkerhetsadvarsel!",
-"Verify" => "Verifiser"
+"next" => "neste"
 );
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index b3a43523a767e4eba8803df2bba23cb08d63e34d..27d32cfcc5e663872e92e15ea57fa616442bc752 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Toevoegen van %s aan favorieten is mislukt.",
 "No categories selected for deletion." => "Geen categorie geselecteerd voor verwijdering.",
 "Error removing %s from favorites." => "Verwijderen %s van favorieten is mislukt.",
+"Sunday" => "Zondag",
+"Monday" => "Maandag",
+"Tuesday" => "Dinsdag",
+"Wednesday" => "Woensdag",
+"Thursday" => "Donderdag",
+"Friday" => "Vrijdag",
+"Saturday" => "Zaterdag",
+"January" => "januari",
+"February" => "februari",
+"March" => "maart",
+"April" => "april",
+"May" => "mei",
+"June" => "juni",
+"July" => "juli",
+"August" => "augustus",
+"September" => "september",
+"October" => "oktober",
+"November" => "november",
+"December" => "december",
 "Settings" => "Instellingen",
 "seconds ago" => "seconden geleden",
 "1 minute ago" => "1 minuut geleden",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Database tablespace",
 "Database host" => "Database server",
 "Finish setup" => "Installatie afronden",
-"Sunday" => "Zondag",
-"Monday" => "Maandag",
-"Tuesday" => "Dinsdag",
-"Wednesday" => "Woensdag",
-"Thursday" => "Donderdag",
-"Friday" => "Vrijdag",
-"Saturday" => "Zaterdag",
-"January" => "januari",
-"February" => "februari",
-"March" => "maart",
-"April" => "april",
-"May" => "mei",
-"June" => "juni",
-"July" => "juli",
-"August" => "augustus",
-"September" => "september",
-"October" => "oktober",
-"November" => "november",
-"December" => "december",
 "web services under your control" => "Webdiensten in eigen beheer",
 "Log out" => "Afmelden",
 "Automatic logon rejected!" => "Automatische aanmelding geweigerd!",
@@ -127,8 +127,5 @@
 "Log in" => "Meld je aan",
 "prev" => "vorige",
 "next" => "volgende",
-"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren.",
-"Security Warning!" => "Beveiligingswaarschuwing!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Verifieer uw wachtwoord!<br/>Om veiligheidsredenen wordt u regelmatig gevraagd uw wachtwoord in te geven.",
-"Verify" => "Verifieer"
+"Updating ownCloud to version %s, this may take a while." => "Updaten ownCloud naar versie %s, dit kan even duren."
 );
diff --git a/core/l10n/nn_NO.php b/core/l10n/nn_NO.php
index 8aaf0b705c81ab83023f76624053c8c40dcd3a11..61b2baffbf2136be5b10399e49d9510d603ba8c0 100644
--- a/core/l10n/nn_NO.php
+++ b/core/l10n/nn_NO.php
@@ -1,4 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Sunday" => "SÃ¸ndag",
+"Monday" => "MÃ¥ndag",
+"Tuesday" => "Tysdag",
+"Wednesday" => "Onsdag",
+"Thursday" => "Torsdag",
+"Friday" => "Fredag",
+"Saturday" => "Laurdag",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Mars",
+"April" => "April",
+"May" => "Mai",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "August",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "Desember",
 "Settings" => "Innstillingar",
 "Cancel" => "Kanseller",
 "Error" => "Feil",
@@ -28,25 +47,6 @@
 "Database name" => "Databasenamn",
 "Database host" => "Databasetenar",
 "Finish setup" => "FullfÃ¸r oppsettet",
-"Sunday" => "SÃ¸ndag",
-"Monday" => "MÃ¥ndag",
-"Tuesday" => "Tysdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Laurdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
 "web services under your control" => "Vev tjenester under din kontroll",
 "Log out" => "Logg ut",
 "Lost your password?" => "GlÃ¸ymt passordet?",
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
index be6d5aec2857af6d5f531e22e7f5bd45d3f338cf..3443f9d501eeb02acc0f7271d3976f2369c979df 100644
--- a/core/l10n/oc.php
+++ b/core/l10n/oc.php
@@ -2,6 +2,25 @@
 "No category to add?" => "Pas de categoria d'ajustar ?",
 "This category already exists: " => "La categoria exista ja :",
 "No categories selected for deletion." => "Pas de categorias seleccionadas per escafar.",
+"Sunday" => "Dimenge",
+"Monday" => "Diluns",
+"Tuesday" => "DimarÃ§",
+"Wednesday" => "Dimecres",
+"Thursday" => "DijÃ²us",
+"Friday" => "Divendres",
+"Saturday" => "Dissabte",
+"January" => "GeniÃ¨r",
+"February" => "FebriÃ¨r",
+"March" => "MarÃ§",
+"April" => "Abril",
+"May" => "Mai",
+"June" => "Junh",
+"July" => "Julhet",
+"August" => "Agost",
+"September" => "Septembre",
+"October" => "Octobre",
+"November" => "Novembre",
+"December" => "Decembre",
 "Settings" => "Configuracion",
 "seconds ago" => "segonda a",
 "1 minute ago" => "1 minuta a",
@@ -69,25 +88,6 @@
 "Database tablespace" => "Espandi de taula de basa de donadas",
 "Database host" => "Ã’ste de basa de donadas",
 "Finish setup" => "Configuracion acabada",
-"Sunday" => "Dimenge",
-"Monday" => "Diluns",
-"Tuesday" => "DimarÃ§",
-"Wednesday" => "Dimecres",
-"Thursday" => "DijÃ²us",
-"Friday" => "Divendres",
-"Saturday" => "Dissabte",
-"January" => "GeniÃ¨r",
-"February" => "FebriÃ¨r",
-"March" => "MarÃ§",
-"April" => "Abril",
-"May" => "Mai",
-"June" => "Junh",
-"July" => "Julhet",
-"August" => "Agost",
-"September" => "Septembre",
-"October" => "Octobre",
-"November" => "Novembre",
-"December" => "Decembre",
 "web services under your control" => "Services web jos ton contrarÃ²tle",
 "Log out" => "Sortida",
 "Lost your password?" => "L'as perdut lo senhal ?",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 159e5b9caed8a567e0aab57162babe17f252ea50..142593930d0a9ba1bd9465c5c261057f5397dfad 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -11,6 +11,25 @@
 "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.",
+"Sunday" => "Niedziela",
+"Monday" => "PoniedziaÅ‚ek",
+"Tuesday" => "Wtorek",
+"Wednesday" => "Åšroda",
+"Thursday" => "Czwartek",
+"Friday" => "PiÄ…tek",
+"Saturday" => "Sobota",
+"January" => "StyczeÅ„",
+"February" => "Luty",
+"March" => "Marzec",
+"April" => "KwiecieÅ„",
+"May" => "Maj",
+"June" => "Czerwiec",
+"July" => "Lipiec",
+"August" => "SierpieÅ„",
+"September" => "WrzesieÅ„",
+"October" => "PaÅºdziernik",
+"November" => "Listopad",
+"December" => "GrudzieÅ„",
 "Settings" => "Ustawienia",
 "seconds ago" => "sekund temu",
 "1 minute ago" => "1 minute temu",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Obszar tabel bazy danych",
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "ZakoÅ„cz konfigurowanie",
-"Sunday" => "Niedziela",
-"Monday" => "PoniedziaÅ‚ek",
-"Tuesday" => "Wtorek",
-"Wednesday" => "Åšroda",
-"Thursday" => "Czwartek",
-"Friday" => "PiÄ…tek",
-"Saturday" => "Sobota",
-"January" => "StyczeÅ„",
-"February" => "Luty",
-"March" => "Marzec",
-"April" => "KwiecieÅ„",
-"May" => "Maj",
-"June" => "Czerwiec",
-"July" => "Lipiec",
-"August" => "SierpieÅ„",
-"September" => "WrzesieÅ„",
-"October" => "PaÅºdziernik",
-"November" => "Listopad",
-"December" => "GrudzieÅ„",
 "web services under your control" => "usÅ‚ugi internetowe pod kontrolÄ…",
 "Log out" => "Wylogowuje uÅ¼ytkownika",
 "Automatic logon rejected!" => "Automatyczne logowanie odrzucone!",
@@ -127,8 +127,5 @@
 "Log in" => "Zaloguj",
 "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Ä™.",
-"Security Warning!" => "OstrzeÅ¼enie o zabezpieczeniach!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "SprawdÅº swoje hasÅ‚o.<br/>Ze wzglÄ™dÃ³w bezpieczeÅ„stwa moÅ¼esz zostaÄ‡ czasami poproszony o wprowadzenie hasÅ‚a ponownie.",
-"Verify" => "Zweryfikowane"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizowanie ownCloud do wersji %s, moÅ¼e to potrwaÄ‡ chwilÄ™."
 );
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index a5e21734c3e3a0505215684c2e3c2bac7fc39c23..8ca2dd4fd0e2e7cacf2e1e53ece237a67576c429 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -7,6 +7,25 @@
 "Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.",
 "No categories selected for deletion." => "Nenhuma categoria selecionada para deletar.",
 "Error removing %s from favorites." => "Erro ao remover %s dos favoritos.",
+"Sunday" => "Domingo",
+"Monday" => "Segunda-feira",
+"Tuesday" => "TerÃ§a-feira",
+"Wednesday" => "Quarta-feira",
+"Thursday" => "Quinta-feira",
+"Friday" => "Sexta-feira",
+"Saturday" => "SÃ¡bado",
+"January" => "Janeiro",
+"February" => "Fevereiro",
+"March" => "MarÃ§o",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Junho",
+"July" => "Julho",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Dezembro",
 "Settings" => "ConfiguraÃ§Ãµes",
 "seconds ago" => "segundos atrÃ¡s",
 "1 minute ago" => "1 minuto atrÃ¡s",
@@ -90,25 +109,6 @@
 "Database tablespace" => "EspaÃ§o de tabela do banco de dados",
 "Database host" => "Banco de dados do host",
 "Finish setup" => "Concluir configuraÃ§Ã£o",
-"Sunday" => "Domingo",
-"Monday" => "Segunda-feira",
-"Tuesday" => "TerÃ§a-feira",
-"Wednesday" => "Quarta-feira",
-"Thursday" => "Quinta-feira",
-"Friday" => "Sexta-feira",
-"Saturday" => "SÃ¡bado",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "MarÃ§o",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
 "web services under your control" => "web services sob seu controle",
 "Log out" => "Sair",
 "Automatic logon rejected!" => "Entrada AutomÃ¡tica no Sistema Rejeitada!",
@@ -118,8 +118,5 @@
 "remember" => "lembrete",
 "Log in" => "Log in",
 "prev" => "anterior",
-"next" => "prÃ³ximo",
-"Security Warning!" => "Aviso de SeguranÃ§a!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de seguranÃ§a, vocÃª deverÃ¡ ser solicitado a muda-la ocasionalmente.",
-"Verify" => "Verificar"
+"next" => "prÃ³ximo"
 );
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index b896dda4003606099ef3fbe7e9f2a61dd9d3f206..4f60bf2694dbb2aa58e5e04879fbcd22f549772d 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -9,11 +9,30 @@
 "Object type not provided." => "Tipo de objecto nÃ£o fornecido",
 "%s ID not provided." => "ID %s nÃ£o fornecido",
 "Error adding %s to favorites." => "Erro a adicionar %s aos favoritos",
-"No categories selected for deletion." => "Nenhuma categoria seleccionar para eliminar",
+"No categories selected for deletion." => "Nenhuma categoria seleccionada para apagar",
 "Error removing %s from favorites." => "Erro a remover %s dos favoritos.",
+"Sunday" => "Domingo",
+"Monday" => "Segunda",
+"Tuesday" => "TerÃ§a",
+"Wednesday" => "Quarta",
+"Thursday" => "Quinta",
+"Friday" => "Sexta",
+"Saturday" => "SÃ¡bado",
+"January" => "Janeiro",
+"February" => "Fevereiro",
+"March" => "MarÃ§o",
+"April" => "Abril",
+"May" => "Maio",
+"June" => "Junho",
+"July" => "Julho",
+"August" => "Agosto",
+"September" => "Setembro",
+"October" => "Outubro",
+"November" => "Novembro",
+"December" => "Dezembro",
 "Settings" => "DefiniÃ§Ãµes",
 "seconds ago" => "Minutos atrÃ¡s",
-"1 minute ago" => "Falta 1 minuto",
+"1 minute ago" => "HÃ¡ 1 minuto",
 "{minutes} minutes ago" => "{minutes} minutos atrÃ¡s",
 "1 hour ago" => "HÃ¡ 1 hora",
 "{hours} hours ago" => "HÃ¡ {hours} horas atrÃ¡s",
@@ -62,7 +81,9 @@
 "Error unsetting expiration date" => "Erro ao retirar a data de expiraÃ§Ã£o",
 "Error setting expiration date" => "Erro ao aplicar a data de expiraÃ§Ã£o",
 "Sending ..." => "A Enviar...",
-"Email sent" => "E-mail enviado com sucesso!",
+"Email sent" => "E-mail 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 actualizaÃ§Ã£o falhou. Por favor reporte este incidente seguindo este link <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "A actualizaÃ§Ã£o foi concluÃda com sucesso. Vai ser redireccionado para o ownCloud agora.",
 "ownCloud password reset" => "ReposiÃ§Ã£o da password ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte endereÃ§o para repor a sua password: {link}",
 "You will receive a link to reset your password via Email." => "Vai receber um endereÃ§o para repor a sua password",
@@ -71,7 +92,7 @@
 "Username" => "Utilizador",
 "Request reset" => "Pedir reposiÃ§Ã£o",
 "Your password was reset" => "A sua password foi reposta",
-"To login page" => "Para a pÃ¡gina de conexÃ£o",
+"To login page" => "Para a pÃ¡gina de entrada",
 "New password" => "Nova password",
 "Reset password" => "Repor password",
 "Personal" => "Pessoal",
@@ -96,39 +117,17 @@
 "Database password" => "Password da base de dados",
 "Database name" => "Nome da base de dados",
 "Database tablespace" => "Tablespace da base de dados",
-"Database host" => "Host da base de dados",
+"Database host" => "AnfitriÃ£o da base de dados",
 "Finish setup" => "Acabar instalaÃ§Ã£o",
-"Sunday" => "Domingo",
-"Monday" => "Segunda",
-"Tuesday" => "TerÃ§a",
-"Wednesday" => "Quarta",
-"Thursday" => "Quinta",
-"Friday" => "Sexta",
-"Saturday" => "SÃ¡bado",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "MarÃ§o",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
 "web services under your control" => "serviÃ§os web sob o seu controlo",
 "Log out" => "Sair",
 "Automatic logon rejected!" => "Login automÃ¡tico rejeitado!",
 "If you did not change your password recently, your account may be compromised!" => "Se nÃ£o mudou a sua palavra-passe recentemente, a sua conta pode ter sido comprometida!",
 "Please change your password to secure your account again." => "Por favor mude a sua palavra-passe para assegurar a sua conta de novo.",
-"Lost your password?" => "Esqueceu a sua password?",
+"Lost your password?" => "Esqueceu-se da sua password?",
 "remember" => "lembrar",
 "Log in" => "Entrar",
 "prev" => "anterior",
 "next" => "seguinte",
-"Updating ownCloud to version %s, this may take a while." => "A Actualizar o ownCloud para a versÃ£o %s, esta operaÃ§Ã£o pode demorar.",
-"Security Warning!" => "Aviso de SeguranÃ§a!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor verifique a sua palavra-passe. <br/>Por razÃµes de seguranÃ§a, pode ser-lhe perguntada, ocasionalmente, a sua palavra-passe de novo.",
-"Verify" => "Verificar"
+"Updating ownCloud to version %s, this may take a while." => "A actualizar o ownCloud para a versÃ£o %s, esta operaÃ§Ã£o pode demorar."
 );
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
index 3c47ef0f8ca6e114167adc03097d9be46142bbb7..3e389bfab0cc0bb2fa8f98557b079cbb12cdd78c 100644
--- a/core/l10n/ro.php
+++ b/core/l10n/ro.php
@@ -1,18 +1,46 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Utilizatorul %s a partajat un fiÈ™ier cu tine",
+"User %s shared a folder with you" => "Utilizatorul %s a partajat un dosar cu tine",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Utilizatorul %s a partajat fiÈ™ierul \"%s\" cu tine. ÃŽl poÈ›i descÄƒrca de aici: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Utilizatorul %s a partajat dosarul \"%s\" cu tine. ÃŽl poÈ›i descÄƒrca de aici: %s ",
 "Category type not provided." => "Tipul de categorie nu este prevazut",
 "No category to add?" => "Nici o categorie de adÄƒugat?",
 "This category already exists: " => "AceastÄƒ categorie deja existÄƒ:",
 "Object type not provided." => "Tipul obiectului nu este prevazut",
+"%s ID not provided." => "ID-ul %s nu a fost introdus",
+"Error adding %s to favorites." => "Eroare la adÄƒugarea %s la favorite",
 "No categories selected for deletion." => "Nici o categorie selectatÄƒ pentru È™tergere.",
+"Error removing %s from favorites." => "Eroare la È™tergerea %s din favorite",
+"Sunday" => "DuminicÄƒ",
+"Monday" => "Luni",
+"Tuesday" => "MarÈ›i",
+"Wednesday" => "Miercuri",
+"Thursday" => "Joi",
+"Friday" => "Vineri",
+"Saturday" => "SÃ¢mbÄƒtÄƒ",
+"January" => "Ianuarie",
+"February" => "Februarie",
+"March" => "Martie",
+"April" => "Aprilie",
+"May" => "Mai",
+"June" => "Iunie",
+"July" => "Iulie",
+"August" => "August",
+"September" => "Septembrie",
+"October" => "Octombrie",
+"November" => "Noiembrie",
+"December" => "Decembrie",
 "Settings" => "ConfigurÄƒri",
 "seconds ago" => "secunde Ã®n urmÄƒ",
 "1 minute ago" => "1 minut Ã®n urmÄƒ",
 "{minutes} minutes ago" => "{minutes} minute in urma",
 "1 hour ago" => "Acum o ora",
+"{hours} hours ago" => "{hours} ore Ã®n urmÄƒ",
 "today" => "astÄƒzi",
 "yesterday" => "ieri",
 "{days} days ago" => "{days} zile in urma",
 "last month" => "ultima lunÄƒ",
+"{months} months ago" => "{months} luni Ã®n urmÄƒ",
 "months ago" => "luni Ã®n urmÄƒ",
 "last year" => "ultimul an",
 "years ago" => "ani Ã®n urmÄƒ",
@@ -21,7 +49,10 @@
 "No" => "Nu",
 "Yes" => "Da",
 "Ok" => "Ok",
+"The object type is not specified." => "Tipul obiectului nu a fost specificat",
 "Error" => "Eroare",
+"The app name is not specified." => "Numele aplicaÈ›iei nu a fost specificat",
+"The required file {file} is not installed!" => "FiÈ™ierul obligatoriu {file} nu este instalat!",
 "Error while sharing" => "Eroare la partajare",
 "Error while unsharing" => "Eroare la anularea partajÄƒrii",
 "Error while changing permissions" => "Eroare la modificarea permisiunilor",
@@ -31,6 +62,8 @@
 "Share with link" => "Partajare cu legÄƒturÄƒ",
 "Password protect" => "Protejare cu parolÄƒ",
 "Password" => "Parola",
+"Email link to person" => "ExpediazÄƒ legÄƒtura prin poÈ™ta electronicÄƒ",
+"Send" => "ExpediazÄƒ",
 "Set expiration date" => "SpecificÄƒ data expirÄƒrii",
 "Expiration date" => "Data expirÄƒrii",
 "Share via email:" => "Distribuie prin email:",
@@ -47,6 +80,8 @@
 "Password protected" => "Protejare cu parolÄƒ",
 "Error unsetting expiration date" => "Eroare la anularea datei de expirare",
 "Error setting expiration date" => "Eroare la specificarea datei de expirare",
+"Sending ..." => "Se expediazÄƒ...",
+"Email sent" => "Mesajul a fost expediat",
 "ownCloud password reset" => "Resetarea parolei ownCloud ",
 "Use the following link to reset your password: {link}" => "FoloseÈ™te urmÄƒtorul link pentru a reseta parola: {link}",
 "You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email",
@@ -82,25 +117,6 @@
 "Database tablespace" => "Tabela de spaÈ›iu a bazei de date",
 "Database host" => "BazÄƒ date",
 "Finish setup" => "FinalizeazÄƒ instalarea",
-"Sunday" => "DuminicÄƒ",
-"Monday" => "Luni",
-"Tuesday" => "MarÈ›i",
-"Wednesday" => "Miercuri",
-"Thursday" => "Joi",
-"Friday" => "Vineri",
-"Saturday" => "SÃ¢mbÄƒtÄƒ",
-"January" => "Ianuarie",
-"February" => "Februarie",
-"March" => "Martie",
-"April" => "Aprilie",
-"May" => "Mai",
-"June" => "Iunie",
-"July" => "Iulie",
-"August" => "August",
-"September" => "Septembrie",
-"October" => "Octombrie",
-"November" => "Noiembrie",
-"December" => "Decembrie",
 "web services under your control" => "servicii web controlate de tine",
 "Log out" => "IeÈ™ire",
 "Automatic logon rejected!" => "Logare automata respinsa",
@@ -111,7 +127,5 @@
 "Log in" => "Autentificare",
 "prev" => "precedentul",
 "next" => "urmÄƒtorul",
-"Security Warning!" => "Advertisment de Securitate",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Te rog verifica parola. <br/>Pentru securitate va poate fi cerut ocazional introducerea parolei din nou",
-"Verify" => "Verifica"
+"Updating ownCloud to version %s, this may take a while." => "ActualizÄƒm ownCloud la versiunea %s, aceasta poate dura cÃ¢teva momente."
 );
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 9a72986aea44390bc7e8a2abfb6bc0dffb7f58da..fd6a7c6094a0b06ca21222a8d2815904a95837e8 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s Ð² Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ðµ",
 "No categories selected for deletion." => "ÐÐµÑ‚ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¹ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ.",
 "Error removing %s from favorites." => "ÐžÑˆÐ¸Ð±ÐºÐ° ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s Ð¸Ð· Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾",
+"Sunday" => "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ",
+"Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº",
+"Tuesday" => "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº",
+"Wednesday" => "Ð¡Ñ€ÐµÐ´Ð°",
+"Thursday" => "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³",
+"Friday" => "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°",
+"Saturday" => "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°",
+"January" => "Ð¯Ð½Ð²Ð°Ñ€ÑŒ",
+"February" => "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ",
+"March" => "ÐœÐ°Ñ€Ñ‚",
+"April" => "ÐÐ¿Ñ€ÐµÐ»ÑŒ",
+"May" => "ÐœÐ°Ð¹",
+"June" => "Ð˜ÑŽÐ½ÑŒ",
+"July" => "Ð˜ÑŽÐ»ÑŒ",
+"August" => "ÐÐ²Ð³ÑƒÑÑ‚",
+"September" => "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ",
+"October" => "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ",
+"November" => "ÐÐ¾ÑÐ±Ñ€ÑŒ",
+"December" => "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ",
 "Settings" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
 "seconds ago" => "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´",
 "1 minute ago" => "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Ð¢Ð°Ð±Ð»Ð¸Ñ‡Ð¾Ðµ Ð¿Ñ€Ð¾ÑÑ‚Ñ€Ð°Ð½ÑÑ‚Ð²Ð¾ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…",
 "Database host" => "Ð¥Ð¾ÑÑ‚ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…",
 "Finish setup" => "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ",
-"Sunday" => "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ",
-"Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº",
-"Tuesday" => "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº",
-"Wednesday" => "Ð¡Ñ€ÐµÐ´Ð°",
-"Thursday" => "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³",
-"Friday" => "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°",
-"Saturday" => "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°",
-"January" => "Ð¯Ð½Ð²Ð°Ñ€ÑŒ",
-"February" => "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ",
-"March" => "ÐœÐ°Ñ€Ñ‚",
-"April" => "ÐÐ¿Ñ€ÐµÐ»ÑŒ",
-"May" => "ÐœÐ°Ð¹",
-"June" => "Ð˜ÑŽÐ½ÑŒ",
-"July" => "Ð˜ÑŽÐ»ÑŒ",
-"August" => "ÐÐ²Ð³ÑƒÑÑ‚",
-"September" => "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ",
-"October" => "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ",
-"November" => "ÐÐ¾ÑÐ±Ñ€ÑŒ",
-"December" => "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ",
 "web services under your control" => "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ ÑÐ»ÑƒÐ¶Ð±Ñ‹ Ð¿Ð¾Ð´ Ñ‚Ð²Ð¾Ð¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼",
 "Log out" => "Ð’Ñ‹Ð¹Ñ‚Ð¸",
 "Automatic logon rejected!" => "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ð²Ñ…Ð¾Ð´ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½!",
@@ -127,8 +127,5 @@
 "Log in" => "Ð’Ð¾Ð¹Ñ‚Ð¸",
 "prev" => "Ð¿Ñ€ÐµÐ´",
 "next" => "ÑÐ»ÐµÐ´",
-"Updating ownCloud to version %s, this may take a while." => "ÐŸÑ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÐ¸Ð¸ %s. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ.",
-"Security Warning!" => "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ ÑÐ²Ð¾Ð¹ â€‹â€‹Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. <br/>ÐŸÐ¾ ÑÐ¾Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑÐ¼ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸, Ð’Ð°Ð¼ Ð¸Ð½Ð¾Ð³Ð´Ð° Ð¿Ñ€Ð¸Ð´ÐµÑ‚ÑÑ Ð²Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÑÐ½Ð¾Ð²Ð°.",
-"Verify" => "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÑŒ"
+"Updating ownCloud to version %s, this may take a while." => "ÐŸÑ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÐ¸Ð¸ %s. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ."
 );
diff --git a/core/l10n/ru_RU.php b/core/l10n/ru_RU.php
index 400aa3996e4539603ccdfd99004bb5a497c4ab60..c706d1c6a1e53172ac446140c933741257d93850 100644
--- a/core/l10n/ru_RU.php
+++ b/core/l10n/ru_RU.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ %s Ð² Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ðµ.",
 "No categories selected for deletion." => "ÐÐµÑ‚ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¹, Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ.",
 "Error removing %s from favorites." => "ÐžÑˆÐ¸Ð±ÐºÐ° ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s Ð¸Ð· Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾.",
+"Sunday" => "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ",
+"Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº",
+"Tuesday" => "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº",
+"Wednesday" => "Ð¡Ñ€ÐµÐ´Ð°",
+"Thursday" => "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³",
+"Friday" => "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°",
+"Saturday" => "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°",
+"January" => "Ð¯Ð½Ð²Ð°Ñ€ÑŒ",
+"February" => "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ",
+"March" => "ÐœÐ°Ñ€Ñ‚",
+"April" => "ÐÐ¿Ñ€ÐµÐ»ÑŒ",
+"May" => "ÐœÐ°Ð¹",
+"June" => "Ð˜ÑŽÐ½ÑŒ",
+"July" => "Ð˜ÑŽÐ»ÑŒ",
+"August" => "ÐÐ²Ð³ÑƒÑÑ‚",
+"September" => "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ",
+"October" => "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ",
+"November" => "ÐÐ¾ÑÐ±Ñ€ÑŒ",
+"December" => "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ",
 "Settings" => "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
 "seconds ago" => "ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´",
 "1 minute ago" => " 1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´",
@@ -63,6 +82,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 community</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾. ÐÐµÐ¼ÐµÐ´Ð»ÐµÐ½Ð½Ð¾Ðµ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð’Ð°Ñ Ð½Ð° ownCloud.",
 "ownCloud password reset" => "ÐŸÐµÑ€ÐµÐ½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ",
 "Use the following link to reset your password: {link}" => "Ð’Ð¾ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚ÐµÑÑŒ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰ÐµÐ¹ ÑÑÑ‹Ð»ÐºÐ¾Ð¹ Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ: {link}",
 "You will receive a link to reset your password via Email." => "Ð’Ñ‹ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚Ðµ ÑÑÑ‹Ð»ÐºÑƒ Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð¿Ð¾ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ðµ.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Ð¢Ð°Ð±Ð»Ð¸Ñ‡Ð½Ð°Ñ Ð¾Ð±Ð»Ð°ÑÑ‚ÑŒ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…",
 "Database host" => "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…",
 "Finish setup" => "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸",
-"Sunday" => "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ",
-"Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº",
-"Tuesday" => "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº",
-"Wednesday" => "Ð¡Ñ€ÐµÐ´Ð°",
-"Thursday" => "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³",
-"Friday" => "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°",
-"Saturday" => "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°",
-"January" => "Ð¯Ð½Ð²Ð°Ñ€ÑŒ",
-"February" => "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ",
-"March" => "ÐœÐ°Ñ€Ñ‚",
-"April" => "ÐÐ¿Ñ€ÐµÐ»ÑŒ",
-"May" => "ÐœÐ°Ð¹",
-"June" => "Ð˜ÑŽÐ½ÑŒ",
-"July" => "Ð˜ÑŽÐ»ÑŒ",
-"August" => "ÐÐ²Ð³ÑƒÑÑ‚",
-"September" => "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ",
-"October" => "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ",
-"November" => "ÐÐ¾ÑÐ±Ñ€ÑŒ",
-"December" => "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ",
 "web services under your control" => "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ð¸ÑÑ‹ Ð¿Ð¾Ð´ Ð’Ð°ÑˆÐ¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼",
 "Log out" => "Ð’Ñ‹Ð¹Ñ‚Ð¸",
 "Automatic logon rejected!" => "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸Ð¹ Ð²Ñ…Ð¾Ð´ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð¾Ñ‚ÐºÐ»Ð¾Ð½ÐµÐ½!",
@@ -127,7 +129,5 @@
 "Log in" => "Ð’Ð¾Ð¹Ñ‚Ð¸",
 "prev" => "Ð¿Ñ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð¸Ð¹",
 "next" => "ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹",
-"Security Warning!" => "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ ÑÐ²Ð¾Ð¹ â€‹â€‹Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. <br/>ÐŸÐ¾ ÑÐ¾Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑÐ¼ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð’Ð°Ð¼ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸Ð½Ð¾Ð³Ð´Ð° Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐµÑ‰Ðµ Ñ€Ð°Ð·.",
-"Verify" => "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ"
+"Updating ownCloud to version %s, this may take a while." => "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÐ¸Ð¸ %s, ÑÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ."
 );
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index a6aeb484ed7d877cf1ebda5c9bb12753d70103fb..3c4e69e89be3bbf633e0d13d223fe918d8f081cb 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -1,5 +1,24 @@
 <?php $TRANSLATIONS = array(
 "No categories selected for deletion." => "à¶¸à¶šà· à¶¯à·à¶¸à·“à¶¸ à·ƒà¶³à·„à· à¶´à·Šâ€à¶»à·€à¶»à·Šà¶œà¶ºà¶±à·Š à¶à·à¶»à· à¶±à·œà¶¸à·à¶.",
+"Sunday" => "à¶‰à¶»à·’à¶¯à·",
+"Monday" => "à·ƒà¶³à·”à¶¯à·",
+"Tuesday" => "à¶…à¶Ÿà·„à¶»à·”à·€à·à¶¯à·",
+"Wednesday" => "à¶¶à¶¯à·à¶¯à·",
+"Thursday" => "à¶¶à·Šâ€à¶»à·„à·ƒà·Šà¶´à¶à·’à¶±à·Šà¶¯à·",
+"Friday" => "à·ƒà·’à¶šà·”à¶»à·à¶¯à·",
+"Saturday" => "à·ƒà·™à¶±à·ƒà·”à¶»à·à¶¯à·",
+"January" => "à¶¢à¶±à·€à·à¶»à·’",
+"February" => "à¶´à·™à¶¶à¶»à·€à·à¶»à·’",
+"March" => "à¶¸à·à¶»à·Šà¶à·”",
+"April" => "à¶…à¶´à·Šâ€à¶»à·šà¶½à·Š",
+"May" => "à¶¸à·à¶ºà·’",
+"June" => "à¶¢à·–à¶±à·’",
+"July" => "à¶¢à·–à¶½à·’",
+"August" => "à¶…à¶œà·à·ƒà·Šà¶à·”",
+"September" => "à·ƒà·à¶´à·Šà¶à·à¶¸à·Šà¶¶à¶»à·Š",
+"October" => "à¶”à¶šà·Šà¶à·à¶¶à¶»à·Š",
+"November" => "à¶±à·œà·€à·à¶¸à·Šà¶¶à¶»à·Š",
+"December" => "à¶¯à·™à·ƒà·à¶¸à·Šà¶¶à¶»à·Š",
 "Settings" => "à·ƒà·à¶šà·ƒà·”à¶¸à·Š",
 "seconds ago" => "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ à¶´à·™à¶»",
 "1 minute ago" => "1 à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶šà¶§ à¶´à·™à¶»",
@@ -61,25 +80,6 @@
 "Database name" => "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à·à·€à·š à¶±à¶¸",
 "Database host" => "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à· à·ƒà·šà·€à·à¶¯à·à¶ºà¶šà¶ºà·",
 "Finish setup" => "à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸ à¶…à·€à·ƒà¶±à·Š à¶šà¶»à¶±à·Šà¶±",
-"Sunday" => "à¶‰à¶»à·’à¶¯à·",
-"Monday" => "à·ƒà¶³à·”à¶¯à·",
-"Tuesday" => "à¶…à¶Ÿà·„à¶»à·”à·€à·à¶¯à·",
-"Wednesday" => "à¶¶à¶¯à·à¶¯à·",
-"Thursday" => "à¶¶à·Šâ€à¶»à·„à·ƒà·Šà¶´à¶à·’à¶±à·Šà¶¯à·",
-"Friday" => "à·ƒà·’à¶šà·”à¶»à·à¶¯à·",
-"Saturday" => "à·ƒà·™à¶±à·ƒà·”à¶»à·à¶¯à·",
-"January" => "à¶¢à¶±à·€à·à¶»à·’",
-"February" => "à¶´à·™à¶¶à¶»à·€à·à¶»à·’",
-"March" => "à¶¸à·à¶»à·Šà¶à·”",
-"April" => "à¶…à¶´à·Šâ€à¶»à·šà¶½à·Š",
-"May" => "à¶¸à·à¶ºà·’",
-"June" => "à¶¢à·–à¶±à·’",
-"July" => "à¶¢à·–à¶½à·’",
-"August" => "à¶…à¶œà·à·ƒà·Šà¶à·”",
-"September" => "à·ƒà·à¶´à·Šà¶à·à¶¸à·Šà¶¶à¶»à·Š",
-"October" => "à¶”à¶šà·Šà¶à·à¶¶à¶»à·Š",
-"November" => "à¶±à·œà·€à·à¶¸à·Šà¶¶à¶»à·Š",
-"December" => "à¶¯à·™à·ƒà·à¶¸à·Šà¶¶à¶»à·Š",
 "web services under your control" => "à¶”à¶¶à¶§ à¶´à·à¶½à¶±à¶º à¶šà·… à·„à·à¶šà·’ à·€à·™à¶¶à·Š à·ƒà·šà·€à·à·€à¶±à·Š",
 "Log out" => "à¶±à·’à¶šà·Šà¶¸à·“à¶¸",
 "Lost your password?" => "à¶¸à·”à¶»à¶´à¶¯à¶º à¶…à¶¸à¶à¶šà¶¯?",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index f9d1aa14e79ddfab0c91db53d7ec0dc8c6a788c2..ba488532f5e094fa6ffdf7ee3b9dbab41c2ac635 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -1,4 +1,8 @@
 <?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 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.",
 "No category to add?" => "Å½iadna kategÃ³ria pre pridanie?",
 "This category already exists: " => "TÃ¡to kategÃ³ria uÅ¾ existuje:",
@@ -7,6 +11,25 @@
 "Error adding %s to favorites." => "Chyba pri pridÃ¡vanÃ %s do obÄ¾ÃºbenÃ½ch poloÅ¾iek.",
 "No categories selected for deletion." => "Neboli vybranÃ© Å¾iadne kategÃ³rie pre odstrÃ¡nenie.",
 "Error removing %s from favorites." => "Chyba pri odstraÅˆovanÃ %s z obÄ¾ÃºbenÃ½ch poloÅ¾iek.",
+"Sunday" => "NedeÄ¾a",
+"Monday" => "Pondelok",
+"Tuesday" => "Utorok",
+"Wednesday" => "Streda",
+"Thursday" => "Å tvrtok",
+"Friday" => "Piatok",
+"Saturday" => "Sobota",
+"January" => "JanuÃ¡r",
+"February" => "FebruÃ¡r",
+"March" => "Marec",
+"April" => "AprÃl",
+"May" => "MÃ¡j",
+"June" => "JÃºn",
+"July" => "JÃºl",
+"August" => "August",
+"September" => "September",
+"October" => "OktÃ³ber",
+"November" => "November",
+"December" => "December",
 "Settings" => "Nastavenia",
 "seconds ago" => "pred sekundami",
 "1 minute ago" => "pred minÃºtou",
@@ -39,6 +62,8 @@
 "Share with link" => "ZdieÄ¾aÅ¥ cez odkaz",
 "Password protect" => "ChrÃ¡niÅ¥ heslom",
 "Password" => "Heslo",
+"Email link to person" => "OdoslaÅ¥ odkaz osobe e-mailom",
+"Send" => "OdoslaÅ¥",
 "Set expiration date" => "NastaviÅ¥ dÃ¡tum expirÃ¡cie",
 "Expiration date" => "DÃ¡tum expirÃ¡cie",
 "Share via email:" => "ZdieÄ¾aÅ¥ cez e-mail:",
@@ -55,6 +80,10 @@
 "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",
+"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.",
 "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.",
@@ -90,25 +119,6 @@
 "Database tablespace" => "TabuÄ¾kovÃ½ priestor databÃ¡zy",
 "Database host" => "Server databÃ¡zy",
 "Finish setup" => "DokonÄiÅ¥ inÅ¡talÃ¡ciu",
-"Sunday" => "NedeÄ¾a",
-"Monday" => "Pondelok",
-"Tuesday" => "Utorok",
-"Wednesday" => "Streda",
-"Thursday" => "Å tvrtok",
-"Friday" => "Piatok",
-"Saturday" => "Sobota",
-"January" => "JanuÃ¡r",
-"February" => "FebruÃ¡r",
-"March" => "Marec",
-"April" => "AprÃl",
-"May" => "MÃ¡j",
-"June" => "JÃºn",
-"July" => "JÃºl",
-"August" => "August",
-"September" => "September",
-"October" => "OktÃ³ber",
-"November" => "November",
-"December" => "December",
 "web services under your control" => "webovÃ© sluÅ¾by pod vaÅ¡ou kontrolou",
 "Log out" => "OdhlÃ¡siÅ¥",
 "Automatic logon rejected!" => "AutomatickÃ© prihlÃ¡senie bolo zamietnutÃ©!",
@@ -119,7 +129,5 @@
 "Log in" => "PrihlÃ¡siÅ¥ sa",
 "prev" => "spÃ¤Å¥",
 "next" => "Äalej",
-"Security Warning!" => "BezpeÄnostnÃ© varovanie!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "ProsÃm, overte svoje heslo. <br />Z bezpeÄnostnÃ½ch dÃ´vodov mÃ´Å¾ete byÅ¥ obÄas poÅ¾iadanÃ½ o jeho opÃ¤tovnÃ© zadanie.",
-"Verify" => "Overenie"
+"Updating ownCloud to version %s, this may take a while." => "Aktualizujem ownCloud na verziu %s, mÃ´Å¾e to chvÃÄ¾u trvaÅ¥."
 );
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 795c5a8995271eb8d6dd2226b5d693b68d2955f2..413a46ffc7939c72870d855969e612cc1390ebc1 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Napaka pri dodajanju %s med priljubljene.",
 "No categories selected for deletion." => "Za izbris ni izbrana nobena kategorija.",
 "Error removing %s from favorites." => "Napaka pri odstranjevanju %s iz priljubljenih.",
+"Sunday" => "nedelja",
+"Monday" => "ponedeljek",
+"Tuesday" => "torek",
+"Wednesday" => "sreda",
+"Thursday" => "Äetrtek",
+"Friday" => "petek",
+"Saturday" => "sobota",
+"January" => "januar",
+"February" => "februar",
+"March" => "marec",
+"April" => "april",
+"May" => "maj",
+"June" => "junij",
+"July" => "julij",
+"August" => "avgust",
+"September" => "september",
+"October" => "oktober",
+"November" => "november",
+"December" => "december",
 "Settings" => "Nastavitve",
 "seconds ago" => "pred nekaj sekundami",
 "1 minute ago" => "pred minuto",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "DokonÄaj namestitev",
-"Sunday" => "nedelja",
-"Monday" => "ponedeljek",
-"Tuesday" => "torek",
-"Wednesday" => "sreda",
-"Thursday" => "Äetrtek",
-"Friday" => "petek",
-"Saturday" => "sobota",
-"January" => "januar",
-"February" => "februar",
-"March" => "marec",
-"April" => "april",
-"May" => "maj",
-"June" => "junij",
-"July" => "julij",
-"August" => "avgust",
-"September" => "september",
-"October" => "oktober",
-"November" => "november",
-"December" => "december",
 "web services under your control" => "spletne storitve pod vaÅ¡im nadzorom",
 "Log out" => "Odjava",
 "Automatic logon rejected!" => "Samodejno prijavljanje je zavrnjeno!",
@@ -126,8 +126,5 @@
 "remember" => "Zapomni si me",
 "Log in" => "Prijava",
 "prev" => "nazaj",
-"next" => "naprej",
-"Security Warning!" => "Varnostno opozorilo!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prosimo, Äe preverite vaÅ¡e geslo. Iz varnostnih razlogov vas lahko obÄasno prosimo, da ga ponovno vnesete.",
-"Verify" => "Preveri"
+"next" => "naprej"
 );
diff --git a/core/l10n/sr.php b/core/l10n/sr.php
index 1679b9e6ddd9cfff1fb7bf87516f6bd2c40729b3..e8547c58acc1337cd77f4174eeabb7c9768919c9 100644
--- a/core/l10n/sr.php
+++ b/core/l10n/sr.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº %s Ð´ÐµÐ»Ð¸ ÑÐ° Ð²Ð°Ð¼Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ",
+"User %s shared a folder with you" => "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº %s Ð´ÐµÐ»Ð¸ ÑÐ° Ð²Ð°Ð¼Ð° Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼",
 "Category type not provided." => "Ð’Ñ€ÑÑ‚Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ðµ Ð½Ð¸Ñ˜Ðµ ÑƒÐ½ÐµÑ‚.",
 "No category to add?" => "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ Ñ˜Ð¾Ñˆ Ð½ÐµÐºÑƒ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ñƒ?",
 "This category already exists: " => "ÐšÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° Ð²ÐµÑ› Ð¿Ð¾ÑÑ‚Ð¾Ñ˜Ð¸:",
@@ -7,6 +9,25 @@
 "Error adding %s to favorites." => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸Ð»Ð¸ÐºÐ¾Ð¼ Ð´Ð¾Ð´Ð°Ð²Ð°ÑšÐ° %s Ñƒ Ð¾Ð¼Ð¸Ñ™ÐµÐ½Ðµ.",
 "No categories selected for deletion." => "ÐÐ¸ Ñ˜ÐµÐ´Ð½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° Ð½Ð¸Ñ˜Ðµ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð° Ð·Ð° Ð±Ñ€Ð¸ÑÐ°ÑšÐµ.",
 "Error removing %s from favorites." => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸Ð»Ð¸ÐºÐ¾Ð¼ ÑƒÐºÐ»Ð°ÑšÐ°ÑšÐ° %s Ð¸Ð· Ð¾Ð¼Ð¸Ñ™ÐµÐ½Ð¸Ñ…",
+"Sunday" => "ÐÐµÐ´ÐµÑ™Ð°",
+"Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÑ™Ð°Ðº",
+"Tuesday" => "Ð£Ñ‚Ð¾Ñ€Ð°Ðº",
+"Wednesday" => "Ð¡Ñ€ÐµÐ´Ð°",
+"Thursday" => "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð°Ðº",
+"Friday" => "ÐŸÐµÑ‚Ð°Ðº",
+"Saturday" => "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°",
+"January" => "ÐˆÐ°Ð½ÑƒÐ°Ñ€",
+"February" => "Ð¤ÐµÐ±Ñ€ÑƒÐ°Ñ€",
+"March" => "ÐœÐ°Ñ€Ñ‚",
+"April" => "ÐÐ¿Ñ€Ð¸Ð»",
+"May" => "ÐœÐ°Ñ˜",
+"June" => "ÐˆÑƒÐ½",
+"July" => "ÐˆÑƒÐ»",
+"August" => "ÐÐ²Ð³ÑƒÑÑ‚",
+"September" => "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð±Ð°Ñ€",
+"October" => "ÐžÐºÑ‚Ð¾Ð±Ð°Ñ€",
+"November" => "ÐÐ¾Ð²ÐµÐ¼Ð±Ð°Ñ€",
+"December" => "Ð”ÐµÑ†ÐµÐ¼Ð±Ð°Ñ€",
 "Settings" => "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°",
 "seconds ago" => "Ð¿Ñ€Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´Ð¸",
 "1 minute ago" => "Ð¿Ñ€Ðµ 1 Ð¼Ð¸Ð½ÑƒÑ‚",
@@ -39,6 +60,7 @@
 "Share with link" => "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð»Ð¸Ð½Ðº",
 "Password protect" => "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼",
 "Password" => "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°",
+"Send" => "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸",
 "Set expiration date" => "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ð´Ð°Ñ‚ÑƒÐ¼ Ð¸ÑÑ‚ÐµÐºÐ°",
 "Expiration date" => "Ð”Ð°Ñ‚ÑƒÐ¼ Ð¸ÑÑ‚ÐµÐºÐ°",
 "Share via email:" => "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð¿Ð¾ÑˆÑ‚Ð¾Ð¼:",
@@ -55,6 +77,8 @@
 "Password protected" => "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼",
 "Error unsetting expiration date" => "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾Ð½Ð¸ÑˆÑ‚Ð°Ð²Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°",
 "Error setting expiration date" => "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾ÑÑ‚Ð°Ð²Ñ™Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°",
+"Sending ..." => "Ð¨Ð°Ñ™ÐµÐ¼...",
+"Email sent" => "ÐŸÐ¾Ñ€ÑƒÐºÐ° Ñ˜Ðµ Ð¿Ð¾ÑÐ»Ð°Ñ‚Ð°",
 "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." => "Ð”Ð¾Ð±Ð¸Ñ›ÐµÑ‚Ðµ Ð²ÐµÐ·Ñƒ Ð·Ð° Ñ€ÐµÑÐµÑ‚Ð¾Ð²Ð°ÑšÐµ Ð»Ð¾Ð·Ð¸Ð½ÐºÐµ Ð¿ÑƒÑ‚ÐµÐ¼ Ðµ-Ð¿Ð¾ÑˆÑ‚Ðµ.",
@@ -90,25 +114,6 @@
 "Database tablespace" => "Ð Ð°Ð´Ð½Ð¸ Ð¿Ñ€Ð¾ÑÑ‚Ð¾Ñ€ Ð±Ð°Ð·Ðµ Ð¿Ð¾Ð´Ð°Ñ‚Ð°ÐºÐ°",
 "Database host" => "Ð”Ð¾Ð¼Ð°Ñ›Ð¸Ð½ Ð±Ð°Ð·Ðµ",
 "Finish setup" => "Ð—Ð°Ð²Ñ€ÑˆÐ¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ",
-"Sunday" => "ÐÐµÐ´ÐµÑ™Ð°",
-"Monday" => "ÐŸÐ¾Ð½ÐµÐ´ÐµÑ™Ð°Ðº",
-"Tuesday" => "Ð£Ñ‚Ð¾Ñ€Ð°Ðº",
-"Wednesday" => "Ð¡Ñ€ÐµÐ´Ð°",
-"Thursday" => "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð°Ðº",
-"Friday" => "ÐŸÐµÑ‚Ð°Ðº",
-"Saturday" => "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°",
-"January" => "ÐˆÐ°Ð½ÑƒÐ°Ñ€",
-"February" => "Ð¤ÐµÐ±Ñ€ÑƒÐ°Ñ€",
-"March" => "ÐœÐ°Ñ€Ñ‚",
-"April" => "ÐÐ¿Ñ€Ð¸Ð»",
-"May" => "ÐœÐ°Ñ˜",
-"June" => "ÐˆÑƒÐ½",
-"July" => "ÐˆÑƒÐ»",
-"August" => "ÐÐ²Ð³ÑƒÑÑ‚",
-"September" => "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð±Ð°Ñ€",
-"October" => "ÐžÐºÑ‚Ð¾Ð±Ð°Ñ€",
-"November" => "ÐÐ¾Ð²ÐµÐ¼Ð±Ð°Ñ€",
-"December" => "Ð”ÐµÑ†ÐµÐ¼Ð±Ð°Ñ€",
 "web services under your control" => "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¾Ð¼",
 "Log out" => "ÐžÐ´Ñ˜Ð°Ð²Ð°",
 "Automatic logon rejected!" => "ÐÑƒÑ‚Ð¾Ð¼Ð°Ñ‚ÑÐºÐ° Ð¿Ñ€Ð¸Ñ˜Ð°Ð²Ð° Ñ˜Ðµ Ð¾Ð´Ð±Ð¸Ñ˜ÐµÐ½Ð°!",
@@ -119,7 +124,5 @@
 "Log in" => "ÐŸÑ€Ð¸Ñ˜Ð°Ð²Ð°",
 "prev" => "Ð¿Ñ€ÐµÑ‚Ñ…Ð¾Ð´Ð½Ð¾",
 "next" => "ÑÐ»ÐµÐ´ÐµÑ›Ðµ",
-"Security Warning!" => "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¾ÑÐ½Ð¾ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸Ñ‚Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ. <br />Ð˜Ð· ÑÐ¸Ð³ÑƒÑ€Ð½Ð¾ÑÐ½Ð¸Ñ… Ñ€Ð°Ð·Ð»Ð¾Ð³Ð° Ð·Ð°Ñ‚Ñ€ÐµÐ¶Ð¸Ñ›ÐµÐ¼Ð¾ Ð²Ð°Ð¼ Ð´Ð° Ð´Ð²Ð° Ð¿ÑƒÑ‚Ð° ÑƒÐ½ÐµÑÐµÑ‚Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ.",
-"Verify" => "ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸"
+"Updating ownCloud to version %s, this may take a while." => "ÐÐ°Ð´Ð¾Ð³Ñ€Ð°Ð´ÑšÐ° ownCloud-Ð° Ð½Ð° Ð²ÐµÑ€Ð·Ð¸Ñ˜Ñƒ %s, ÑÐ°Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð°Ðº."
 );
diff --git a/core/l10n/sr@latin.php b/core/l10n/sr@latin.php
index efcb7c10f01605b7bbe5a3ca3a748403081d7c1d..ec3eab34e29d801fec536a601e20bc22e6213392 100644
--- a/core/l10n/sr@latin.php
+++ b/core/l10n/sr@latin.php
@@ -1,4 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Sunday" => "Nedelja",
+"Monday" => "Ponedeljak",
+"Tuesday" => "Utorak",
+"Wednesday" => "Sreda",
+"Thursday" => "ÄŒetvrtak",
+"Friday" => "Petak",
+"Saturday" => "Subota",
+"January" => "Januar",
+"February" => "Februar",
+"March" => "Mart",
+"April" => "April",
+"May" => "Maj",
+"June" => "Jun",
+"July" => "Jul",
+"August" => "Avgust",
+"September" => "Septembar",
+"October" => "Oktobar",
+"November" => "Novembar",
+"December" => "Decembar",
 "Settings" => "PodeÅ¡avanja",
 "Cancel" => "OtkaÅ¾i",
 "Password" => "Lozinka",
@@ -24,25 +43,6 @@
 "Database name" => "Ime baze",
 "Database host" => "DomaÄ‡in baze",
 "Finish setup" => "ZavrÅ¡i podeÅ¡avanje",
-"Sunday" => "Nedelja",
-"Monday" => "Ponedeljak",
-"Tuesday" => "Utorak",
-"Wednesday" => "Sreda",
-"Thursday" => "ÄŒetvrtak",
-"Friday" => "Petak",
-"Saturday" => "Subota",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mart",
-"April" => "April",
-"May" => "Maj",
-"June" => "Jun",
-"July" => "Jul",
-"August" => "Avgust",
-"September" => "Septembar",
-"October" => "Oktobar",
-"November" => "Novembar",
-"December" => "Decembar",
 "Log out" => "Odjava",
 "Lost your password?" => "Izgubili ste lozinku?",
 "remember" => "upamti",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 6bb62613048514b4f390affcbc56471b7f8bcdce..1e461282c0b13236f1514f468fd549ab36bdc9fc 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "Fel vid tillÃ¤gg av %s till favoriter.",
 "No categories selected for deletion." => "Inga kategorier valda fÃ¶r radering.",
 "Error removing %s from favorites." => "Fel vid borttagning av %s frÃ¥n favoriter.",
+"Sunday" => "SÃ¶ndag",
+"Monday" => "MÃ¥ndag",
+"Tuesday" => "Tisdag",
+"Wednesday" => "Onsdag",
+"Thursday" => "Torsdag",
+"Friday" => "Fredag",
+"Saturday" => "LÃ¶rdag",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Mars",
+"April" => "April",
+"May" => "Maj",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "Augusti",
+"September" => "September",
+"October" => "Oktober",
+"November" => "November",
+"December" => "December",
 "Settings" => "InstÃ¤llningar",
 "seconds ago" => "sekunder sedan",
 "1 minute ago" => "1 minut sedan",
@@ -63,6 +82,8 @@
 "Error setting expiration date" => "Fel vid sÃ¤ttning av utgÃ¥ngsdatum",
 "Sending ..." => "Skickar ...",
 "Email sent" => "E-post skickat",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-gemenskapen</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud",
 "ownCloud password reset" => "ownCloud lÃ¶senordsÃ¥terstÃ¤llning",
 "Use the following link to reset your password: {link}" => "AnvÃ¤nd fÃ¶ljande lÃ¤nk fÃ¶r att Ã¥terstÃ¤lla lÃ¶senordet: {link}",
 "You will receive a link to reset your password via Email." => "Du fÃ¥r en lÃ¤nk att Ã¥terstÃ¤lla ditt lÃ¶senord via e-post.",
@@ -98,25 +119,6 @@
 "Database tablespace" => "Databas tabellutrymme",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
-"Sunday" => "SÃ¶ndag",
-"Monday" => "MÃ¥ndag",
-"Tuesday" => "Tisdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "LÃ¶rdag",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mars",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Augusti",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
 "web services under your control" => "webbtjÃ¤nster under din kontroll",
 "Log out" => "Logga ut",
 "Automatic logon rejected!" => "Automatisk inloggning inte tillÃ¥ten!",
@@ -127,8 +129,5 @@
 "Log in" => "Logga in",
 "prev" => "fÃ¶regÃ¥ende",
 "next" => "nÃ¤sta",
-"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund.",
-"Security Warning!" => "SÃ¤kerhetsvarning!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "BekrÃ¤fta ditt lÃ¶senord. <br/>Av sÃ¤kerhetsskÃ¤l kan du ibland bli ombedd att ange ditt lÃ¶senord igen.",
-"Verify" => "Verifiera"
+"Updating ownCloud to version %s, this may take a while." => "Uppdaterar ownCloud till version %s, detta kan ta en stund."
 );
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index ec5f142ecfb57d94d341591af28859ff535e0ff4..f4f204968ff68b25749ece7f976734739be28ab1 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -7,6 +7,25 @@
 "Error adding %s to favorites." => "à®µà®¿à®°à¯à®ªà¯à®ªà®™à¯à®•à®³à¯à®•à¯à®•à¯ %s à® à®šà¯‡à®°à¯à®ªà¯à®ªà®¤à®¿à®²à¯ à®µà®´à¯",
 "No categories selected for deletion." => "à®¨à¯€à®•à¯à®•à¯à®µà®¤à®±à¯à®•à¯ à®Žà®¨à¯à®¤à®ªà¯ à®ªà®¿à®°à®¿à®µà¯à®®à¯ à®¤à¯†à®°à®¿à®µà¯à®šà¯†à®¯à¯à®¯à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ.",
 "Error removing %s from favorites." => "à®µà®¿à®°à¯à®ªà¯à®ªà®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ %s à® à®…à®•à®±à¯à®±à¯à®µà®¤à®¿à®²à¯ à®µà®´à¯.à®‰à®‡à®‡",
+"Sunday" => "à®žà®¾à®¯à®¿à®±à¯à®±à¯à®•à¯à®•à®¿à®´à®®à¯ˆ",
+"Monday" => "à®¤à®¿à®™à¯à®•à®Ÿà¯à®•à®¿à®´à®®à¯ˆ",
+"Tuesday" => "à®šà¯†à®µà¯à®µà®¾à®¯à¯à®•à¯à®•à®¿à®´à®®à¯ˆ",
+"Wednesday" => "à®ªà¯à®¤à®©à¯à®•à®¿à®´à®®à¯ˆ",
+"Thursday" => "à®µà®¿à®¯à®¾à®´à®•à¯à®•à®¿à®´à®®à¯ˆ",
+"Friday" => "à®µà¯†à®³à¯à®³à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ",
+"Saturday" => "à®šà®©à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ",
+"January" => "à®¤à¯ˆ",
+"February" => "à®®à®¾à®šà®¿",
+"March" => "à®ªà®™à¯à®•à¯à®©à®¿",
+"April" => "à®šà®¿à®¤à¯à®¤à®¿à®°à¯ˆ",
+"May" => "à®µà¯ˆà®•à®¾à®šà®¿",
+"June" => "à®†à®©à®¿",
+"July" => "à®†à®Ÿà®¿",
+"August" => "à®†à®µà®£à®¿",
+"September" => "à®ªà¯à®°à®Ÿà¯à®Ÿà®¾à®šà®¿",
+"October" => "à®à®ªà¯à®ªà®šà®¿",
+"November" => "à®•à®¾à®°à¯à®¤à¯à®¤à®¿à®•à¯ˆ",
+"December" => "à®®à®¾à®°à¯à®•à®´à®¿",
 "Settings" => "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯",
 "seconds ago" => "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯",
 "1 minute ago" => "1 à®¨à®¿à®®à®¿à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ ",
@@ -90,25 +109,6 @@
 "Database tablespace" => "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®…à®Ÿà¯à®Ÿà®µà®£à¯ˆ",
 "Database host" => "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®“à®®à¯à®ªà¯à®©à®°à¯",
 "Finish setup" => "à®…à®®à¯ˆà®ªà¯à®ªà¯ˆ à®®à¯à®Ÿà®¿à®•à¯à®•",
-"Sunday" => "à®žà®¾à®¯à®¿à®±à¯à®±à¯à®•à¯à®•à®¿à®´à®®à¯ˆ",
-"Monday" => "à®¤à®¿à®™à¯à®•à®Ÿà¯à®•à®¿à®´à®®à¯ˆ",
-"Tuesday" => "à®šà¯†à®µà¯à®µà®¾à®¯à¯à®•à¯à®•à®¿à®´à®®à¯ˆ",
-"Wednesday" => "à®ªà¯à®¤à®©à¯à®•à®¿à®´à®®à¯ˆ",
-"Thursday" => "à®µà®¿à®¯à®¾à®´à®•à¯à®•à®¿à®´à®®à¯ˆ",
-"Friday" => "à®µà¯†à®³à¯à®³à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ",
-"Saturday" => "à®šà®©à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ",
-"January" => "à®¤à¯ˆ",
-"February" => "à®®à®¾à®šà®¿",
-"March" => "à®ªà®™à¯à®•à¯à®©à®¿",
-"April" => "à®šà®¿à®¤à¯à®¤à®¿à®°à¯ˆ",
-"May" => "à®µà¯ˆà®•à®¾à®šà®¿",
-"June" => "à®†à®©à®¿",
-"July" => "à®†à®Ÿà®¿",
-"August" => "à®†à®µà®£à®¿",
-"September" => "à®ªà¯à®°à®Ÿà¯à®Ÿà®¾à®šà®¿",
-"October" => "à®à®ªà¯à®ªà®šà®¿",
-"November" => "à®•à®¾à®°à¯à®¤à¯à®¤à®¿à®•à¯ˆ",
-"December" => "à®®à®¾à®°à¯à®•à®´à®¿",
 "web services under your control" => "à®‰à®™à¯à®•à®³à¯ à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ à®•à¯€à®´à¯ à®‡à®£à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®•à®³à¯",
 "Log out" => "à®µà®¿à®Ÿà¯à®ªà®¤à®¿à®•à¯ˆ à®šà¯†à®¯à¯à®•",
 "Automatic logon rejected!" => "à®¤à®©à¯à®©à®¿à®šà¯à®šà¯ˆà®¯à®¾à®© à®ªà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ à®¨à®¿à®°à®¾à®•à®°à®¿à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯!",
@@ -118,8 +118,5 @@
 "remember" => "à®žà®¾à®ªà®•à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•",
 "Log in" => "à®ªà¯à®•à¯à®ªà®¤à®¿à®•à¯ˆ",
 "prev" => "à®®à¯à®¨à¯à®¤à¯ˆà®¯",
-"next" => "à®…à®Ÿà¯à®¤à¯à®¤à¯",
-"Security Warning!" => "à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯ à®Žà®šà¯à®šà®°à®¿à®•à¯à®•à¯ˆ!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®‰à®±à¯à®¤à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•. <br/> à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯ à®•à®¾à®°à®£à®™à¯à®•à®³à¯à®•à¯à®•à®¾à®• à®¨à¯€à®™à¯à®•à®³à¯ à®Žà®ªà¯à®ªà¯‹à®¤à®¾à®µà®¤à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à¯€à®£à¯à®Ÿà¯à®®à¯ à®¨à¯à®´à¯ˆà®•à¯à®• à®•à¯‡à®Ÿà¯à®•à®ªà¯à®ªà®Ÿà¯à®µà¯€à®°à¯à®•à®³à¯.",
-"Verify" => "à®‰à®±à¯à®¤à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯"
+"next" => "à®…à®Ÿà¯à®¤à¯à®¤à¯"
 );
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 7cbc39dd1e04519ae51ac1d3459b1d3d7c6d2cd4..9b491d24eaeac26bae2630d653156771c4b8da71 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹„à¸Ÿà¸¥à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“",
+"User %s shared a folder with you" => "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹„à¸Ÿà¸¥à¹Œ \"%s\" à¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“ à¹à¸¥à¸°à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹„à¸”à¹‰à¸ˆà¸²à¸à¸—à¸µà¹ˆà¸™à¸µà¹ˆ: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ \"%s\" à¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“ à¹à¸¥à¸°à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹„à¸”à¹‰à¸ˆà¸²à¸à¸—à¸µà¹ˆà¸™à¸µà¹ˆ: %s",
 "Category type not provided." => "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸°à¸šà¸¸à¸Šà¸™à¸´à¸”à¸‚à¸à¸‡à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆ",
 "No category to add?" => "à¹„à¸¡à¹ˆà¸¡à¸µà¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆà¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡?",
 "This category already exists: " => "à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆà¸™à¸µà¹‰à¸¡à¸µà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§: ",
@@ -7,6 +11,25 @@
 "Error adding %s to favorites." => "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¹€à¸žà¸´à¹ˆà¸¡ %s à¹€à¸‚à¹‰à¸²à¹„à¸›à¸¢à¸±à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¹‚à¸›à¸£à¸”",
 "No categories selected for deletion." => "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹€à¸¥à¸·à¸à¸à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆà¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸¥à¸š",
 "Error removing %s from favorites." => "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¥à¸š %s à¸à¸à¸à¸ˆà¸²à¸à¸£à¸²à¸¢à¸à¸²à¸£à¹‚à¸›à¸£à¸”",
+"Sunday" => "à¸§à¸±à¸™à¸à¸²à¸—à¸´à¸•à¸¢à¹Œ",
+"Monday" => "à¸§à¸±à¸™à¸ˆà¸±à¸™à¸—à¸£à¹Œ",
+"Tuesday" => "à¸§à¸±à¸™à¸à¸±à¸‡à¸„à¸²à¸£",
+"Wednesday" => "à¸§à¸±à¸™à¸žà¸¸à¸˜",
+"Thursday" => "à¸§à¸±à¸™à¸žà¸¤à¸«à¸±à¸ªà¸šà¸”à¸µ",
+"Friday" => "à¸§à¸±à¸™à¸¨à¸¸à¸à¸£à¹Œ",
+"Saturday" => "à¸§à¸±à¸™à¹€à¸ªà¸²à¸£à¹Œ",
+"January" => "à¸¡à¸à¸£à¸²à¸„à¸¡",
+"February" => "à¸à¸¸à¸¡à¸ à¸²à¸žà¸±à¸™à¸˜à¹Œ",
+"March" => "à¸¡à¸µà¸™à¸²à¸„à¸¡",
+"April" => "à¹€à¸¡à¸©à¸²à¸¢à¸™",
+"May" => "à¸žà¸¤à¸©à¸ à¸²à¸„à¸¡",
+"June" => "à¸¡à¸´à¸–à¸¸à¸™à¸²à¸¢à¸™",
+"July" => "à¸à¸£à¸à¸à¸²à¸„à¸¡",
+"August" => "à¸ªà¸´à¸‡à¸«à¸²à¸„à¸¡",
+"September" => "à¸à¸±à¸™à¸¢à¸²à¸¢à¸™",
+"October" => "à¸•à¸¸à¸¥à¸²à¸„à¸¡",
+"November" => "à¸žà¸¤à¸¨à¸ˆà¸´à¸à¸²à¸¢à¸™",
+"December" => "à¸˜à¸±à¸™à¸§à¸²à¸„à¸¡",
 "Settings" => "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²",
 "seconds ago" => "à¸§à¸´à¸™à¸²à¸—à¸µ à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
 "1 minute ago" => "1 à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰",
@@ -39,6 +62,8 @@
 "Share with link" => "à¹à¸Šà¸£à¹Œà¸”à¹‰à¸§à¸¢à¸¥à¸´à¸‡à¸à¹Œ",
 "Password protect" => "à¹ƒà¸ªà¹ˆà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸§à¹‰",
 "Password" => "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™",
+"Email link to person" => "à¸ªà¹ˆà¸‡à¸¥à¸´à¸‡à¸à¹Œà¹ƒà¸«à¹‰à¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥",
+"Send" => "à¸ªà¹ˆà¸‡",
 "Set expiration date" => "à¸à¸³à¸«à¸™à¸”à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸",
 "Expiration date" => "à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸",
 "Share via email:" => "à¹à¸Šà¸£à¹Œà¸œà¹ˆà¸²à¸™à¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥",
@@ -55,6 +80,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" => "à¸£à¸µà¹€à¸‹à¹‡à¸•à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™ ownCloud",
 "Use the following link to reset your password: {link}" => "à¹ƒà¸Šà¹‰à¸¥à¸´à¸‡à¸„à¹Œà¸•à¹ˆà¸à¹„à¸›à¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¹ƒà¸«à¸¡à¹ˆ: {link}",
 "You will receive a link to reset your password via Email." => "à¸„à¸¸à¸“à¸ˆà¸°à¹„à¸”à¹‰à¸£à¸±à¸šà¸¥à¸´à¸‡à¸„à¹Œà¹€à¸žà¸·à¹ˆà¸à¸à¸³à¸«à¸™à¸”à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆà¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œ",
@@ -90,25 +119,6 @@
 "Database tablespace" => "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸•à¸²à¸£à¸²à¸‡à¹ƒà¸™à¸à¸²à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥",
 "Database host" => "Database host",
 "Finish setup" => "à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§",
-"Sunday" => "à¸§à¸±à¸™à¸à¸²à¸—à¸´à¸•à¸¢à¹Œ",
-"Monday" => "à¸§à¸±à¸™à¸ˆà¸±à¸™à¸—à¸£à¹Œ",
-"Tuesday" => "à¸§à¸±à¸™à¸à¸±à¸‡à¸„à¸²à¸£",
-"Wednesday" => "à¸§à¸±à¸™à¸žà¸¸à¸˜",
-"Thursday" => "à¸§à¸±à¸™à¸žà¸¤à¸«à¸±à¸ªà¸šà¸”à¸µ",
-"Friday" => "à¸§à¸±à¸™à¸¨à¸¸à¸à¸£à¹Œ",
-"Saturday" => "à¸§à¸±à¸™à¹€à¸ªà¸²à¸£à¹Œ",
-"January" => "à¸¡à¸à¸£à¸²à¸„à¸¡",
-"February" => "à¸à¸¸à¸¡à¸ à¸²à¸žà¸±à¸™à¸˜à¹Œ",
-"March" => "à¸¡à¸µà¸™à¸²à¸„à¸¡",
-"April" => "à¹€à¸¡à¸©à¸²à¸¢à¸™",
-"May" => "à¸žà¸¤à¸©à¸ à¸²à¸„à¸¡",
-"June" => "à¸¡à¸´à¸–à¸¸à¸™à¸²à¸¢à¸™",
-"July" => "à¸à¸£à¸à¸à¸²à¸„à¸¡",
-"August" => "à¸ªà¸´à¸‡à¸«à¸²à¸„à¸¡",
-"September" => "à¸à¸±à¸™à¸¢à¸²à¸¢à¸™",
-"October" => "à¸•à¸¸à¸¥à¸²à¸„à¸¡",
-"November" => "à¸žà¸¤à¸¨à¸ˆà¸´à¸à¸²à¸¢à¸™",
-"December" => "à¸˜à¸±à¸™à¸§à¸²à¸„à¸¡",
 "web services under your control" => "web services under your control",
 "Log out" => "à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š",
 "Automatic logon rejected!" => "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸šà¸à¸±à¸•à¹‚à¸™à¸¡à¸±à¸•à¸´à¸–à¸¹à¸à¸›à¸à¸´à¹€à¸ªà¸˜à¹à¸¥à¹‰à¸§",
@@ -119,7 +129,5 @@
 "Log in" => "à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š",
 "prev" => "à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²",
 "next" => "à¸–à¸±à¸”à¹„à¸›",
-"Security Warning!" => "à¸„à¸³à¹€à¸•à¸·à¸à¸™à¹€à¸žà¸·à¹ˆà¸à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "à¸à¸£à¸¸à¸“à¸²à¸¢à¸·à¸™à¸¢à¸±à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“ <br/> à¹€à¸žà¸·à¹ˆà¸à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢ à¸„à¸¸à¸“à¸ˆà¸°à¸–à¸¹à¸à¸‚à¸à¹ƒà¸«à¹‰à¸à¸£à¸à¸à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡",
-"Verify" => "à¸¢à¸·à¸™à¸¢à¸±à¸™"
+"Updating ownCloud to version %s, this may take a while." => "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹€à¸”à¸— ownCloud à¹„à¸›à¹€à¸›à¹‡à¸™à¸£à¸¸à¹ˆà¸™ %s, à¸à¸£à¸¸à¸“à¸²à¸£à¸à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ"
 );
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 1020b61f9b99c9bc202fd69ba86ea9056be1188a..f64ecbedd5a49e00453afccb2482283226377cb3 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -1,9 +1,35 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "%s kullanÄ±cÄ±sÄ± sizinle bir dosyayÄ± paylaÅŸtÄ±",
+"User %s shared a folder with you" => "%s kullanÄ±cÄ±sÄ± sizinle bir dizini paylaÅŸtÄ±",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s kullanÄ±cÄ±sÄ± \"%s\" dosyasÄ±nÄ± sizinle paylaÅŸtÄ±. %s adresinden indirilebilir",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s kullanÄ±cÄ±sÄ± \"%s\" dizinini sizinle paylaÅŸtÄ±. %s adresinden indirilebilir",
 "Category type not provided." => "Kategori tÃ¼rÃ¼ desteklenmemektedir.",
 "No category to add?" => "Eklenecek kategori yok?",
 "This category already exists: " => "Bu kategori zaten mevcut: ",
 "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",
 "No categories selected for deletion." => "Silmek iÃ§in bir kategori seÃ§ilmedi",
+"Error removing %s from favorites." => "%s favorilere Ã§Ä±karÄ±lÄ±rken hata oluÅŸtu",
+"Sunday" => "Pazar",
+"Monday" => "Pazartesi",
+"Tuesday" => "SalÄ±",
+"Wednesday" => "Ã‡arÅŸamba",
+"Thursday" => "PerÅŸembe",
+"Friday" => "Cuma",
+"Saturday" => "Cumartesi",
+"January" => "Ocak",
+"February" => "Åžubat",
+"March" => "Mart",
+"April" => "Nisan",
+"May" => "MayÄ±s",
+"June" => "Haziran",
+"July" => "Temmuz",
+"August" => "AÄŸustos",
+"September" => "EylÃ¼l",
+"October" => "Ekim",
+"November" => "KasÄ±m",
+"December" => "AralÄ±k",
 "Settings" => "Ayarlar",
 "seconds ago" => "saniye Ã¶nce",
 "1 minute ago" => "1 dakika Ã¶nce",
@@ -25,18 +51,25 @@
 "Ok" => "Tamam",
 "The object type is not specified." => "Nesne tÃ¼rÃ¼ belirtilmemiÅŸ.",
 "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.",
 "Error while sharing" => "PaylaÅŸÄ±m sÄ±rasÄ±nda hata  ",
+"Error while unsharing" => "PaylaÅŸÄ±m iptal ediliyorken hata",
 "Error while changing permissions" => "Ä°zinleri deÄŸiÅŸtirirken hata oluÅŸtu",
+"Shared with you and the group {group} by {owner}" => " {owner} tarafÄ±ndan sizinle ve {group} ile paylaÅŸtÄ±rÄ±lmÄ±ÅŸ",
+"Shared with you by {owner}" => "{owner} trafÄ±ndan sizinle paylaÅŸtÄ±rÄ±ldÄ±",
 "Share with" => "ile PaylaÅŸ",
 "Share with link" => "BaÄŸlantÄ± ile paylaÅŸ",
 "Password protect" => "Åžifre korunmasÄ±",
 "Password" => "Parola",
+"Email link to person" => "KiÅŸiye e-posta linki",
 "Send" => "GÃ¶nder",
 "Set expiration date" => "Son kullanma tarihini ayarla",
 "Expiration date" => "Son kullanÄ±m tarihi",
 "Share via email:" => "Eposta ile paylaÅŸ",
 "No people found" => "KiÅŸi bulunamadÄ±",
 "Resharing is not allowed" => "Tekrar paylaÅŸmaya izin verilmiyor",
+"Shared in {item} with {user}" => " {item} iÃ§inde  {user} ile paylaÅŸÄ±lanlarlar",
 "Unshare" => "PaylaÅŸÄ±lmayan",
 "can edit" => "dÃ¼zenleyebilir",
 "access control" => "eriÅŸim kontrolÃ¼",
@@ -45,6 +78,8 @@
 "delete" => "sil",
 "share" => "paylaÅŸ",
 "Password protected" => "Paralo korumalÄ±",
+"Error unsetting expiration date" => "GeÃ§erlilik tarihi tanÄ±mlama kaldÄ±rma hatasÄ±",
+"Error setting expiration date" => "GeÃ§erlilik tarihi tanÄ±mlama hatasÄ±",
 "Sending ..." => "GÃ¶nderiliyor...",
 "Email sent" => "Eposta gÃ¶nderildi",
 "ownCloud password reset" => "ownCloud parola sÄ±fÄ±rlama",
@@ -68,6 +103,9 @@
 "Edit categories" => "Kategorileri dÃ¼zenle",
 "Add" => "Ekle",
 "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 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.",
 "Create an <strong>admin account</strong>" => "Bir <strong>yÃ¶netici hesabÄ±</strong> oluÅŸturun",
 "Advanced" => "GeliÅŸmiÅŸ",
 "Data folder" => "Veri klasÃ¶rÃ¼",
@@ -79,33 +117,15 @@
 "Database tablespace" => "VeritabanÄ± tablo alanÄ±",
 "Database host" => "VeritabanÄ± sunucusu",
 "Finish setup" => "Kurulumu tamamla",
-"Sunday" => "Pazar",
-"Monday" => "Pazartesi",
-"Tuesday" => "SalÄ±",
-"Wednesday" => "Ã‡arÅŸamba",
-"Thursday" => "PerÅŸembe",
-"Friday" => "Cuma",
-"Saturday" => "Cumartesi",
-"January" => "Ocak",
-"February" => "Åžubat",
-"March" => "Mart",
-"April" => "Nisan",
-"May" => "MayÄ±s",
-"June" => "Haziran",
-"July" => "Temmuz",
-"August" => "AÄŸustos",
-"September" => "EylÃ¼l",
-"October" => "Ekim",
-"November" => "KasÄ±m",
-"December" => "AralÄ±k",
 "web services under your control" => "kontrolÃ¼nÃ¼zdeki web servisleri",
 "Log out" => "Ã‡Ä±kÄ±ÅŸ yap",
 "Automatic logon rejected!" => "Otomatik oturum aÃ§ma reddedildi!",
+"If you did not change your password recently, your account may be compromised!" => "YakÄ±n zamanda parolanÄ±zÄ± deÄŸiÅŸtirmedi iseniz hesabÄ±nÄ±z riske girebilir.",
+"Please change your password to secure your account again." => "HesabÄ±nÄ±zÄ± korumak iÃ§in lÃ¼tfen parolanÄ±zÄ± deÄŸiÅŸtirin.",
 "Lost your password?" => "ParolanÄ±zÄ± mÄ± unuttunuz?",
 "remember" => "hatÄ±rla",
 "Log in" => "GiriÅŸ yap",
 "prev" => "Ã¶nceki",
 "next" => "sonraki",
-"Security Warning!" => "GÃ¼venlik UyarÄ±sÄ±!",
-"Verify" => "DoÄŸrula"
+"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 c088db6d4192be371c1f05950418260af6540005..34387cc914e9b0c1809ca727c6bcea3749efa8fd 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ– %s Ð´Ð¾ Ð¾Ð±Ñ€Ð°Ð½Ð¾Ð³Ð¾.",
 "No categories selected for deletion." => "Ð–Ð¾Ð´Ð½Ð¾Ñ— ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ— Ð½Ðµ Ð¾Ð±Ñ€Ð°Ð½Ð¾ Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ.",
 "Error removing %s from favorites." => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ñ– %s Ñ–Ð· Ð¾Ð±Ñ€Ð°Ð½Ð¾Ð³Ð¾.",
+"Sunday" => "ÐÐµÐ´Ñ–Ð»Ñ",
+"Monday" => "ÐŸÐ¾Ð½ÐµÐ´Ñ–Ð»Ð¾Ðº",
+"Tuesday" => "Ð’Ñ–Ð²Ñ‚Ð¾Ñ€Ð¾Ðº",
+"Wednesday" => "Ð¡ÐµÑ€ÐµÐ´Ð°",
+"Thursday" => "Ð§ÐµÑ‚Ð²ÐµÑ€",
+"Friday" => "ÐŸ'ÑÑ‚Ð½Ð¸Ñ†Ñ",
+"Saturday" => "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°",
+"January" => "Ð¡Ñ–Ñ‡ÐµÐ½ÑŒ",
+"February" => "Ð›ÑŽÑ‚Ð¸Ð¹",
+"March" => "Ð‘ÐµÑ€ÐµÐ·ÐµÐ½ÑŒ",
+"April" => "ÐšÐ²Ñ–Ñ‚ÐµÐ½ÑŒ",
+"May" => "Ð¢Ñ€Ð°Ð²ÐµÐ½ÑŒ",
+"June" => "Ð§ÐµÑ€Ð²ÐµÐ½ÑŒ",
+"July" => "Ð›Ð¸Ð¿ÐµÐ½ÑŒ",
+"August" => "Ð¡ÐµÑ€Ð¿ÐµÐ½ÑŒ",
+"September" => "Ð’ÐµÑ€ÐµÑÐµÐ½ÑŒ",
+"October" => "Ð–Ð¾Ð²Ñ‚ÐµÐ½ÑŒ",
+"November" => "Ð›Ð¸ÑÑ‚Ð¾Ð¿Ð°Ð´",
+"December" => "Ð“Ñ€ÑƒÐ´ÐµÐ½ÑŒ",
 "Settings" => "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
 "seconds ago" => "ÑÐµÐºÑƒÐ½Ð´Ð¸ Ñ‚Ð¾Ð¼Ñƒ",
 "1 minute ago" => "1 Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ",
@@ -98,25 +117,6 @@
 "Database tablespace" => "Ð¢Ð°Ð±Ð»Ð¸Ñ†Ñ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…",
 "Database host" => "Ð¥Ð¾ÑÑ‚ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…",
 "Finish setup" => "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ",
-"Sunday" => "ÐÐµÐ´Ñ–Ð»Ñ",
-"Monday" => "ÐŸÐ¾Ð½ÐµÐ´Ñ–Ð»Ð¾Ðº",
-"Tuesday" => "Ð’Ñ–Ð²Ñ‚Ð¾Ñ€Ð¾Ðº",
-"Wednesday" => "Ð¡ÐµÑ€ÐµÐ´Ð°",
-"Thursday" => "Ð§ÐµÑ‚Ð²ÐµÑ€",
-"Friday" => "ÐŸ'ÑÑ‚Ð½Ð¸Ñ†Ñ",
-"Saturday" => "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°",
-"January" => "Ð¡Ñ–Ñ‡ÐµÐ½ÑŒ",
-"February" => "Ð›ÑŽÑ‚Ð¸Ð¹",
-"March" => "Ð‘ÐµÑ€ÐµÐ·ÐµÐ½ÑŒ",
-"April" => "ÐšÐ²Ñ–Ñ‚ÐµÐ½ÑŒ",
-"May" => "Ð¢Ñ€Ð°Ð²ÐµÐ½ÑŒ",
-"June" => "Ð§ÐµÑ€Ð²ÐµÐ½ÑŒ",
-"July" => "Ð›Ð¸Ð¿ÐµÐ½ÑŒ",
-"August" => "Ð¡ÐµÑ€Ð¿ÐµÐ½ÑŒ",
-"September" => "Ð’ÐµÑ€ÐµÑÐµÐ½ÑŒ",
-"October" => "Ð–Ð¾Ð²Ñ‚ÐµÐ½ÑŒ",
-"November" => "Ð›Ð¸ÑÑ‚Ð¾Ð¿Ð°Ð´",
-"December" => "Ð“Ñ€ÑƒÐ´ÐµÐ½ÑŒ",
 "web services under your control" => "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ñ–Ñ Ð¿Ñ–Ð´ Ð²Ð°ÑˆÐ¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼",
 "Log out" => "Ð’Ð¸Ñ…Ñ–Ð´",
 "Automatic logon rejected!" => "ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡Ð½Ð¸Ð¹ Ð²Ñ…Ñ–Ð´ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ñƒ Ð²Ñ–Ð´Ñ…Ð¸Ð»ÐµÐ½Ð¸Ð¹!",
@@ -127,7 +127,5 @@
 "Log in" => "Ð’Ñ…Ñ–Ð´",
 "prev" => "Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð½Ñ–Ð¹",
 "next" => "Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹",
-"Security Warning!" => "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÐºÑƒ!",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ ÑÐ²Ñ–Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. <br/>Ð— Ð¿Ð¸Ñ‚Ð°Ð½ÑŒ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, Ð’Ð°Ð¼ Ñ–Ð½ÐºÐ¾Ð»Ð¸ Ð´Ð¾Ð²ÐµÐ´ÐµÑ‚ÑŒÑÑ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ Ð²Ð²Ð¾Ð´Ð¸Ñ‚Ð¸ ÑÐ²Ñ–Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ.",
-"Verify" => "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚Ð¸"
+"Updating ownCloud to version %s, this may take a while." => "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÑ–Ñ— %s, Ñ†Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑ‚Ð¸ Ð´ÐµÑÐºÐ¸Ð¹ Ñ‡Ð°Ñ."
 );
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index b27600491df8050b0e45fd46cb613714aaca2fb2..1d538e99dbbcb23b6f64c6d6510f066186a98a1d 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "%s chia sáº» táºp tin nÃ y cho báº¡n",
+"User %s shared a folder with you" => "%s chia sáº» thÆ° má»¥c nÃ y cho báº¡n",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "NgÆ°á»i dÃ¹ng %s chia sáº» táºp tin \"%s\" cho báº¡n .Báº¡n cÃ³ thá»ƒ táº£i táº¡i Ä‘Ã¢y : %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "NgÆ°á»i dÃ¹ng %s chia sáº» thÆ° má»¥c \"%s\" cho báº¡n .Báº¡n cÃ³ thá»ƒ táº£i táº¡i Ä‘Ã¢y : %s",
 "Category type not provided." => "Kiá»ƒu háº¡ng má»¥c khÃ´ng Ä‘Æ°á»£c cung cáº¥p.",
 "No category to add?" => "KhÃ´ng cÃ³ danh má»¥c Ä‘Æ°á»£c thÃªm?",
 "This category already exists: " => "Danh má»¥c nÃ y Ä‘Ã£ Ä‘Æ°á»£c táº¡o :",
@@ -7,6 +11,25 @@
 "Error adding %s to favorites." => "Lá»—i thÃªm %s vÃ o má»¥c yÃªu thÃch.",
 "No categories selected for deletion." => "KhÃ´ng cÃ³ thá»ƒ loáº¡i nÃ o Ä‘Æ°á»£c chá»n Ä‘á»ƒ xÃ³a.",
 "Error removing %s from favorites." => "Lá»—i xÃ³a %s tá»« má»¥c yÃªu thÃch.",
+"Sunday" => "Chá»§ nháºt",
+"Monday" => "Thá»© 2",
+"Tuesday" => "Thá»© 3",
+"Wednesday" => "Thá»© 4",
+"Thursday" => "Thá»© 5",
+"Friday" => "Thá»© ",
+"Saturday" => "Thá»© 7",
+"January" => "ThÃ¡ng 1",
+"February" => "ThÃ¡ng 2",
+"March" => "ThÃ¡ng 3",
+"April" => "ThÃ¡ng 4",
+"May" => "ThÃ¡ng 5",
+"June" => "ThÃ¡ng 6",
+"July" => "ThÃ¡ng 7",
+"August" => "ThÃ¡ng 8",
+"September" => "ThÃ¡ng 9",
+"October" => "ThÃ¡ng 10",
+"November" => "ThÃ¡ng 11",
+"December" => "ThÃ¡ng 12",
 "Settings" => "CÃ i Ä‘áº·t",
 "seconds ago" => "vÃ i giÃ¢y trÆ°á»›c",
 "1 minute ago" => "1 phÃºt trÆ°á»›c",
@@ -39,6 +62,7 @@
 "Share with link" => "Chia sáº» vá»›i liÃªn káº¿t",
 "Password protect" => "Máºt kháº©u báº£o vá»‡",
 "Password" => "Máºt kháº©u",
+"Send" => "Gá»Ÿi",
 "Set expiration date" => "Äáº·t ngÃ y káº¿t thÃºc",
 "Expiration date" => "NgÃ y káº¿t thÃºc",
 "Share via email:" => "Chia sáº» thÃ´ng qua email",
@@ -55,6 +79,9 @@
 "Password protected" => "Máºt kháº©u báº£o vá»‡",
 "Error unsetting expiration date" => "Lá»—i khÃ´ng thiáº¿t láºp ngÃ y káº¿t thÃºc",
 "Error setting expiration date" => "Lá»—i cáº¥u hÃ¬nh ngÃ y káº¿t thÃºc",
+"Sending ..." => "Äang gá»Ÿi ...",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "Cáºp nháºt khÃ´ng thÃ nh cÃ´ng . Vui lÃ²ng thÃ´ng bÃ¡o Ä‘áº¿n <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cá»™ng Ä‘á»“ng ownCloud </a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Cáºp nháºt thÃ nh cÃ´ng .Há»‡ thá»‘ng sáº½ Ä‘Æ°a báº¡n tá»›i ownCloud.",
 "ownCloud password reset" => "KhÃ´i phá»¥c máºt kháº©u Owncloud ",
 "Use the following link to reset your password: {link}" => "DÃ¹ng Ä‘Æ°á»ng dáº«n sau Ä‘á»ƒ khÃ´i phá»¥c láº¡i máºt kháº©u : {link}",
 "You will receive a link to reset your password via Email." => "Vui lÃ²ng kiá»ƒm tra Email Ä‘á»ƒ khÃ´i phá»¥c láº¡i máºt kháº©u.",
@@ -90,25 +117,6 @@
 "Database tablespace" => "CÆ¡ sá»Ÿ dá»¯ liá»‡u tablespace",
 "Database host" => "Database host",
 "Finish setup" => "CÃ i Ä‘áº·t hoÃ n táº¥t",
-"Sunday" => "Chá»§ nháºt",
-"Monday" => "Thá»© 2",
-"Tuesday" => "Thá»© 3",
-"Wednesday" => "Thá»© 4",
-"Thursday" => "Thá»© 5",
-"Friday" => "Thá»© ",
-"Saturday" => "Thá»© 7",
-"January" => "ThÃ¡ng 1",
-"February" => "ThÃ¡ng 2",
-"March" => "ThÃ¡ng 3",
-"April" => "ThÃ¡ng 4",
-"May" => "ThÃ¡ng 5",
-"June" => "ThÃ¡ng 6",
-"July" => "ThÃ¡ng 7",
-"August" => "ThÃ¡ng 8",
-"September" => "ThÃ¡ng 9",
-"October" => "ThÃ¡ng 10",
-"November" => "ThÃ¡ng 11",
-"December" => "ThÃ¡ng 12",
 "web services under your control" => "cÃ¡c dá»‹ch vá»¥ web dÆ°á»›i sá»± kiá»ƒm soÃ¡t cá»§a báº¡n",
 "Log out" => "ÄÄƒng xuáº¥t",
 "Automatic logon rejected!" => "Tá»± Ä‘á»™ng Ä‘Äƒng nháºp Ä‘Ã£ bá»‹ tá»« chá»‘i !",
@@ -118,8 +126,5 @@
 "remember" => "ghi nhá»›",
 "Log in" => "ÄÄƒng nháºp",
 "prev" => "LÃ¹i láº¡i",
-"next" => "Káº¿ tiáº¿p",
-"Security Warning!" => "Cáº£nh bÃ¡o báº£o máºt !",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Vui lÃ²ng xÃ¡c nháºn máºt kháº©u cá»§a báº¡n. <br/> VÃ¬ lÃ½ do báº£o máºt thá»‰nh thoáº£ng báº¡n cÃ³ thá»ƒ Ä‘Æ°á»£c yÃªu cáº§u nháºp láº¡i máºt kháº©u.",
-"Verify" => "Kiá»ƒm tra"
+"next" => "Káº¿ tiáº¿p"
 );
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 1f6d51987039f9550143c4ddadd8ad343252a6ab..a76c3a6c796a912184c48ca824bbde21a642b53c 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -2,6 +2,25 @@
 "No category to add?" => "æ²¡æœ‰åˆ†ç±»æ·»åŠ äº†?",
 "This category already exists: " => "è¿™ä¸ªåˆ†ç±»å·²ç»å˜åœ¨äº†:",
 "No categories selected for deletion." => "æ²¡æœ‰é€‰è€…è¦åˆ é™¤çš„åˆ†ç±».",
+"Sunday" => "æ˜ŸæœŸå¤©",
+"Monday" => "æ˜ŸæœŸä¸€",
+"Tuesday" => "æ˜ŸæœŸäºŒ",
+"Wednesday" => "æ˜ŸæœŸä¸‰",
+"Thursday" => "æ˜ŸæœŸå››",
+"Friday" => "æ˜ŸæœŸäº”",
+"Saturday" => "æ˜ŸæœŸå…",
+"January" => "ä¸€æœˆ",
+"February" => "äºŒæœˆ",
+"March" => "ä¸‰æœˆ",
+"April" => "å››æœˆ",
+"May" => "äº”æœˆ",
+"June" => "å…æœˆ",
+"July" => "ä¸ƒæœˆ",
+"August" => "å…«æœˆ",
+"September" => "ä¹æœˆ",
+"October" => "åæœˆ",
+"November" => "åä¸€æœˆ",
+"December" => "åäºŒæœˆ",
 "Settings" => "è®¾ç½®",
 "seconds ago" => "ç§’å‰",
 "1 minute ago" => "1 åˆ†é’Ÿå‰",
@@ -79,25 +98,6 @@
 "Database tablespace" => "æ•°æ®åº“è¡¨æ ¼ç©ºé—´",
 "Database host" => "æ•°æ®åº“ä¸»æœº",
 "Finish setup" => "å®Œæˆå®‰è£…",
-"Sunday" => "æ˜ŸæœŸå¤©",
-"Monday" => "æ˜ŸæœŸä¸€",
-"Tuesday" => "æ˜ŸæœŸäºŒ",
-"Wednesday" => "æ˜ŸæœŸä¸‰",
-"Thursday" => "æ˜ŸæœŸå››",
-"Friday" => "æ˜ŸæœŸäº”",
-"Saturday" => "æ˜ŸæœŸå…",
-"January" => "ä¸€æœˆ",
-"February" => "äºŒæœˆ",
-"March" => "ä¸‰æœˆ",
-"April" => "å››æœˆ",
-"May" => "äº”æœˆ",
-"June" => "å…æœˆ",
-"July" => "ä¸ƒæœˆ",
-"August" => "å…«æœˆ",
-"September" => "ä¹æœˆ",
-"October" => "åæœˆ",
-"November" => "åä¸€æœˆ",
-"December" => "åäºŒæœˆ",
 "web services under your control" => "ä½ æŽ§åˆ¶ä¸‹çš„ç½‘ç»œæœåŠ¡",
 "Log out" => "æ³¨é”€",
 "Automatic logon rejected!" => "è‡ªåŠ¨ç™»å½•è¢«æ‹’ç»ï¼",
@@ -107,8 +107,5 @@
 "remember" => "å¤‡å¿˜",
 "Log in" => "ç™»é™†",
 "prev" => "åŽé€€",
-"next" => "å‰è¿›",
-"Security Warning!" => "å®‰å…¨è¦å‘Šï¼",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "è¯·ç¡®è®¤æ‚¨çš„å¯†ç ã€‚<br/>å¤„äºŽå®‰å…¨åŽŸå› ä½ å¶å°”ä¹Ÿä¼šè¢«è¦æ±‚å†æ¬¡è¾“å…¥æ‚¨çš„å¯†ç ã€‚",
-"Verify" => "ç¡®è®¤"
+"next" => "å‰è¿›"
 );
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 82e80bd000e565141943794c395b1e9dce66f740..3918cd165d6c513015a6c205e68e882ae438099c 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "å‘æ”¶è—å¤¹ä¸æ–°å¢ž%sæ—¶å‡ºé”™ã€‚",
 "No categories selected for deletion." => "æ²¡æœ‰é€‰æ‹©è¦åˆ é™¤çš„ç±»åˆ«",
 "Error removing %s from favorites." => "ä»Žæ”¶è—å¤¹ä¸ç§»é™¤%sæ—¶å‡ºé”™ã€‚",
+"Sunday" => "æ˜ŸæœŸæ—¥",
+"Monday" => "æ˜ŸæœŸä¸€",
+"Tuesday" => "æ˜ŸæœŸäºŒ",
+"Wednesday" => "æ˜ŸæœŸä¸‰",
+"Thursday" => "æ˜ŸæœŸå››",
+"Friday" => "æ˜ŸæœŸäº”",
+"Saturday" => "æ˜ŸæœŸå…",
+"January" => "ä¸€æœˆ",
+"February" => "äºŒæœˆ",
+"March" => "ä¸‰æœˆ",
+"April" => "å››æœˆ",
+"May" => "äº”æœˆ",
+"June" => "å…æœˆ",
+"July" => "ä¸ƒæœˆ",
+"August" => "å…«æœˆ",
+"September" => "ä¹æœˆ",
+"October" => "åæœˆ",
+"November" => "åä¸€æœˆ",
+"December" => "åäºŒæœˆ",
 "Settings" => "è®¾ç½®",
 "seconds ago" => "ç§’å‰",
 "1 minute ago" => "ä¸€åˆ†é’Ÿå‰",
@@ -43,6 +62,7 @@
 "Share with link" => "å…±äº«é“¾æŽ¥",
 "Password protect" => "å¯†ç ä¿æŠ¤",
 "Password" => "å¯†ç ",
+"Email link to person" => "å‘é€é“¾æŽ¥åˆ°ä¸ªäºº",
 "Send" => "å‘é€",
 "Set expiration date" => "è®¾ç½®è¿‡æœŸæ—¥æœŸ",
 "Expiration date" => "è¿‡æœŸæ—¥æœŸ",
@@ -97,25 +117,6 @@
 "Database tablespace" => "æ•°æ®åº“è¡¨ç©ºé—´",
 "Database host" => "æ•°æ®åº“ä¸»æœº",
 "Finish setup" => "å®‰è£…å®Œæˆ",
-"Sunday" => "æ˜ŸæœŸæ—¥",
-"Monday" => "æ˜ŸæœŸä¸€",
-"Tuesday" => "æ˜ŸæœŸäºŒ",
-"Wednesday" => "æ˜ŸæœŸä¸‰",
-"Thursday" => "æ˜ŸæœŸå››",
-"Friday" => "æ˜ŸæœŸäº”",
-"Saturday" => "æ˜ŸæœŸå…",
-"January" => "ä¸€æœˆ",
-"February" => "äºŒæœˆ",
-"March" => "ä¸‰æœˆ",
-"April" => "å››æœˆ",
-"May" => "äº”æœˆ",
-"June" => "å…æœˆ",
-"July" => "ä¸ƒæœˆ",
-"August" => "å…«æœˆ",
-"September" => "ä¹æœˆ",
-"October" => "åæœˆ",
-"November" => "åä¸€æœˆ",
-"December" => "åäºŒæœˆ",
 "web services under your control" => "ç”±æ‚¨æŽŒæŽ§çš„ç½‘ç»œæœåŠ¡",
 "Log out" => "æ³¨é”€",
 "Automatic logon rejected!" => "è‡ªåŠ¨ç™»å½•è¢«æ‹’ç»ï¼",
@@ -126,7 +127,5 @@
 "Log in" => "ç™»å½•",
 "prev" => "ä¸Šä¸€é¡µ",
 "next" => "ä¸‹ä¸€é¡µ",
-"Security Warning!" => "å®‰å…¨è¦å‘Šï¼",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "è¯·éªŒè¯æ‚¨çš„å¯†ç ã€‚ <br/>å‡ºäºŽå®‰å…¨è€ƒè™‘ï¼Œä½ å¯èƒ½å¶å°”ä¼šè¢«è¦æ±‚å†æ¬¡è¾“å…¥å¯†ç ã€‚",
-"Verify" => "éªŒè¯"
+"Updating ownCloud to version %s, this may take a while." => "æ›´æ–° ownCloud åˆ°ç‰ˆæœ¬ %sï¼Œè¿™å¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚"
 );
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index de91ba0bd830d8d624a896b84e8962a7bd7ad19d..78a069a63dcc69ba798e0a7d32d76870b8106151 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -11,6 +11,25 @@
 "Error adding %s to favorites." => "åŠ å…¥ %s åˆ°æœ€æ„›æ™‚ç™¼ç”ŸéŒ¯èª¤ã€‚",
 "No categories selected for deletion." => "æ²’æœ‰é¸æ“‡è¦åˆªé™¤çš„åˆ†é¡žã€‚",
 "Error removing %s from favorites." => "å¾žæœ€æ„›ç§»é™¤ %s æ™‚ç™¼ç”ŸéŒ¯èª¤ã€‚",
+"Sunday" => "é€±æ—¥",
+"Monday" => "é€±ä¸€",
+"Tuesday" => "é€±äºŒ",
+"Wednesday" => "é€±ä¸‰",
+"Thursday" => "é€±å››",
+"Friday" => "é€±äº”",
+"Saturday" => "é€±å…",
+"January" => "ä¸€æœˆ",
+"February" => "äºŒæœˆ",
+"March" => "ä¸‰æœˆ",
+"April" => "å››æœˆ",
+"May" => "äº”æœˆ",
+"June" => "å…æœˆ",
+"July" => "ä¸ƒæœˆ",
+"August" => "å…«æœˆ",
+"September" => "ä¹æœˆ",
+"October" => "åæœˆ",
+"November" => "åä¸€æœˆ",
+"December" => "åäºŒæœˆ",
 "Settings" => "è¨å®š",
 "seconds ago" => "å¹¾ç§’å‰",
 "1 minute ago" => "1 åˆ†é˜å‰",
@@ -98,25 +117,6 @@
 "Database tablespace" => "è³‡æ–™åº« tablespace",
 "Database host" => "è³‡æ–™åº«ä¸»æ©Ÿ",
 "Finish setup" => "å®Œæˆè¨å®š",
-"Sunday" => "é€±æ—¥",
-"Monday" => "é€±ä¸€",
-"Tuesday" => "é€±äºŒ",
-"Wednesday" => "é€±ä¸‰",
-"Thursday" => "é€±å››",
-"Friday" => "é€±äº”",
-"Saturday" => "é€±å…",
-"January" => "ä¸€æœˆ",
-"February" => "äºŒæœˆ",
-"March" => "ä¸‰æœˆ",
-"April" => "å››æœˆ",
-"May" => "äº”æœˆ",
-"June" => "å…æœˆ",
-"July" => "ä¸ƒæœˆ",
-"August" => "å…«æœˆ",
-"September" => "ä¹æœˆ",
-"October" => "åæœˆ",
-"November" => "åä¸€æœˆ",
-"December" => "åäºŒæœˆ",
 "web services under your control" => "ç¶²è·¯æœå‹™åœ¨æ‚¨æŽ§åˆ¶ä¹‹ä¸‹",
 "Log out" => "ç™»å‡º",
 "Automatic logon rejected!" => "è‡ªå‹•ç™»å…¥è¢«æ‹’ï¼",
@@ -127,8 +127,5 @@
 "Log in" => "ç™»å…¥",
 "prev" => "ä¸Šä¸€é ",
 "next" => "ä¸‹ä¸€é ",
-"Updating ownCloud to version %s, this may take a while." => "æ£åœ¨å°‡ Owncloud å‡ç´šè‡³ç‰ˆæœ¬ %s ï¼Œé€™å¯èƒ½éœ€è¦ä¸€é»žæ™‚é–“ã€‚",
-"Security Warning!" => "å®‰å…¨æ€§è¦å‘Šï¼",
-"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "è«‹è¼¸å…¥æ‚¨çš„å¯†ç¢¼ã€‚<br/>åŸºæ–¼å®‰å…¨æ€§çš„ç†ç”±ï¼Œæ‚¨æœ‰æ™‚å€™å¯èƒ½æœƒè¢«è¦æ±‚å†æ¬¡è¼¸å…¥å¯†ç¢¼ã€‚",
-"Verify" => "é©—è‰"
+"Updating ownCloud to version %s, this may take a while." => "æ£åœ¨å°‡ Owncloud å‡ç´šè‡³ç‰ˆæœ¬ %s ï¼Œé€™å¯èƒ½éœ€è¦ä¸€é»žæ™‚é–“ã€‚"
 );
diff --git a/core/routes.php b/core/routes.php
index fc511d403d85ba24966930854b17b21c748f2157..7408858b107cb79c8c705d02d81fd5bad59f6895 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -32,6 +32,9 @@ $this->create('core_ajax_vcategories_favorites', '/core/ajax/vcategories/favorit
 	->actionInclude('core/ajax/vcategories/favorites.php');
 $this->create('core_ajax_vcategories_edit', '/core/ajax/vcategories/edit.php')
 	->actionInclude('core/ajax/vcategories/edit.php');
+// oC JS config
+$this->create('js_config', '/core/js/config.js')
+	->actionInclude('core/js/config.php');
 // Routing
 $this->create('core_ajax_routes', '/core/routes.json')
 	->action('OC_Router', 'JSRoutes');
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 3128c4f2e7040233da77efe8427149420285e97c..03c580c9b0b0c12c58bd5dd75cbd452c88da486b 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,7 +1,7 @@
-<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input>
-<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input>
-<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input>
-<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input>
+<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'] ?>'>
 <form action="index.php" method="post">
 <input type="hidden" name="install" value="true" />
 	<?php if(count($_['errors']) > 0): ?>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 47f4b423b3e92b80b16a02f9950643baa5612a77..47fb75612cf130ea8237a8ab4fa71f38fa49abca 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -7,12 +7,7 @@
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
-		<script type="text/javascript">
-			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
-			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
-			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-		</script>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 8395426e4e4d5917f367ba746374148dd3b60f51..9aabc08acece8c025b9da0d643a3a23b16bde406 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -3,20 +3,12 @@
 	<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'); ?>" />
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
-		<script type="text/javascript">
-			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
-			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
-			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
-			var dayNames = <?php echo 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'))) ?>;
-			var monthNames = <?php echo 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'))) ?>;
-			var firstDay = <?php echo json_encode($l->l('firstday', 'firstday')) ?>;
-		</script>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index ba5053edecf8e430e848e14fad60d49982e8be1a..2886c3c5a2e16130d4ba64745a9d1e8f9cdefdfb 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,33 +1,17 @@
 <!DOCTYPE html>
 <html>
 	<head>
-		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
+		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getDisplayName()?' ('.OC_Util::sanitizeHTML(OC_User::getDisplayName()).') ':'' ?></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'); ?>" />
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
-		<script type="text/javascript">
-			var oc_debug = <?php echo (defined('DEBUG') && DEBUG) ? 'true' : 'false'; ?>;
-			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
-			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
-			var oc_current_user = '<?php echo OC_User::getUser() ?>';
-			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
-			var dayNames = <?php echo 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'))) ?>;
-			var monthNames = <?php echo 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'))) ?>;
-			var firstDay = <?php echo json_encode($l->l('firstday', 'firstday')) ?>;
-		</script>
+		<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('js_config');?>"></script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
-		<script type="text/javascript">
-			requesttoken = '<?php echo $_['requesttoken']; ?>';
-			OC.EventSource.requesttoken=requesttoken;
-			$(document).bind('ajaxSend', function(elm, xhr, s) {
-				xhr.setRequestHeader('requesttoken', requesttoken);
-			});
-		</script>
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
 				echo '<'.$header['tag'].' ';
@@ -40,7 +24,10 @@
 	</head>
 
 	<body id="<?php echo $_['bodyid'];?>">
-		<header><div id="header">
+	<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 class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');  echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 			<form class="searchbox header-right" action="#" method="post">
@@ -67,8 +54,10 @@
 			</ul>
 		</div></nav>
 
-		<div id="content">
-			<?php echo $_['content']; ?>
+		<div id="content-wrapper">
+			<div id="content">
+				<?php echo $_['content']; ?>
+			</div>
 		</div>
 	</body>
 </html>
diff --git a/core/templates/login.php b/core/templates/login.php
index 10093baabf710855cb489205a1f48b778fccea00..c82d2cafa2e2c4c08fa893776899476800102993 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,50 +1,45 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form method="post">
-    <fieldset>
-        <?php if (!empty($_['redirect_url'])) {
-        echo '<input type="hidden" name="redirect_url" value="' . $_['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>
-                <br>
-                <small><?php echo $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') ?>">
-                <li class="errors">
-                    <?php echo $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' : ''; ?>
-                   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=""/>
-        </p>
+	<fieldset>
+	<?php if (!empty($_['redirect_url'])) {
+		echo '<input type="hidden" name="redirect_url" value="' . $_['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>
+				<br>
+				<small><?php echo $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') ?>">
+				<li class="errors">
+					<?php echo $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' : ''; ?>
+				   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=""/>
+		</p>
 
-        <p class="infield groupbottom">
-            <input type="password" name="password" id="password" value=""
-                   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
-            <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-            <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
-        </p>
-        <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
-            for="remember_login"><?php echo $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'); ?>"/>
-    </fieldset>
+		<p class="infield groupbottom">
+			<input type="password" name="password" id="password" value=""
+				   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
+			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+		</p>
+		<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
+			for="remember_login"><?php echo $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'); ?>"/>
+	</fieldset>
 </form>
-<script>
-    $(document).ready(function () {
-        var visitortimezone = (-new Date().getTimezoneOffset() / 60);
-        $('#timezone-offset').val(visitortimezone);
-    });
+<?php OCP\Util::addscript('core', 'visitortimezone'); ?>
 
-</script>
diff --git a/core/templates/update.php b/core/templates/update.php
index c9f3144f25770dcc29086b64a75c0efaeaa56d01..ae714dcfb92211849acd7dbde483e4e2f246bdd6 100644
--- a/core/templates/update.php
+++ b/core/templates/update.php
@@ -3,29 +3,3 @@
 		<?php echo $l->t('Updating ownCloud to version %s, this may take a while.', array($_['version'])); ?><br /><br />
 	</li>
 </ul>
-<script>
-	$(document).ready(function () {
-		OC.EventSource.requesttoken = oc_requesttoken;
-		var updateEventSource = new OC.EventSource(OC.webroot+'/core/ajax/update.php');
-		updateEventSource.listen('success', function(message) {
-			$('<span>').append(message).append('<br />').appendTo($('.update'));
-		});
-		updateEventSource.listen('error', function(message) {
-			$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
-		});
-		updateEventSource.listen('failure', function(message) {
-			$('<span>').addClass('error').append(message).append('<br />').appendTo($('.update'));
-			$('<span>')
-				.addClass('error bold')
-				.append('<br />')
-				.append(t('core', 'The update was unsuccessful. Please report this issue to the <a href="https://github.com/owncloud/core/issues" target="_blank">ownCloud community</a>.'))
-				.appendTo($('.update'));
-		});
-		updateEventSource.listen('done', function(message) {
-			$('<span>').addClass('bold').append('<br />').append(t('core', 'The update was successful. Redirecting you to ownCloud now.')).appendTo($('.update'));
-			setTimeout(function () {
-				window.location.href = OC.webroot;
-			}, 3000);
-		});
-	});
-</script>
\ No newline at end of file
diff --git a/core/templates/verify.php b/core/templates/verify.php
deleted file mode 100644
index 600eaca05b753d73795b29dfb8e28c583db3510b..0000000000000000000000000000000000000000
--- a/core/templates/verify.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<form method="post">
-	<fieldset>
-		<ul>
-			<li class="errors">
-				<?php echo $l->t('Security Warning!'); ?><br>
-				<small><?php echo $l->t("Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again."); ?></small>
-			</li>
-		</ul>
-		<p class="infield">
-			<input type="text"  value="<?php echo $_['username']; ?>" disabled="disabled" />
-		</p>
-		<p class="infield">
-			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
-			<input type="password" name="password" id="password" value="" required />
-		</p>
-		<input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Verify' ); ?>" />
-	</fieldset>
-</form>
diff --git a/db_structure.xml b/db_structure.xml
index db43ef21140650496e2deb352818064340f98f4f..e878eac7690fc9cb278c078d49f5fa4fae6cee43 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -679,6 +679,14 @@
 				<length>64</length>
 			</field>
 
+			<field>
+				<name>displayname</name>
+				<type>text</type>
+				<default></default>
+				<notnull>true</notnull>
+				<length>64</length>
+			</field>
+
 			<field>
 				<name>password</name>
 				<type>text</type>
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 74243a0cff640c56538dc4d825f3fff743d2b191..0ce541f850cb2d55ad4545cf9e244452b37adb1e 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,59 +81,135 @@ msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ø®ØªÙŠØ§Ø± ÙØ¦Ø© Ù„Ù„ØØ°Ù"
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Ø§Ù„Ø§ØØ¯"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Ø§Ù„Ø£Ø«Ù†ÙŠÙ†"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Ø§Ù„Ø«Ù„Ø§Ø«Ø§Ø¡"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Ø§Ù„Ø§Ø±Ø¨Ø¹Ø§Ø¡"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ø§Ù„Ø®Ù…ÙŠØ³"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Ø§Ù„Ø¬Ù…Ø¹Ù‡"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Ø§Ù„Ø³Ø¨Øª"
+
+#: js/config.php:33
+msgid "January"
+msgstr "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Ø´Ø¨Ø§Ø·"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Ø¢Ø°Ø§Ø±"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Ù†ÙŠØ³Ø§Ù†"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Ø£ÙŠØ§Ø±"
+
+#: js/config.php:33
+msgid "June"
+msgstr "ØØ²ÙŠØ±Ø§Ù†"
+
+#: js/config.php:33
+msgid "July"
+msgstr "ØªÙ…ÙˆØ²"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Ø¢Ø¨"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Ø£ÙŠÙ„ÙˆÙ„"
+
+#: js/config.php:33
+msgid "October"
+msgstr "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø§ÙˆÙ„"
+
+#: js/config.php:33
+msgid "November"
+msgstr "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ"
+
+#: js/config.php:33
+msgid "December"
+msgstr "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø§ÙˆÙ„"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ØªØ¹Ø¯ÙŠÙ„Ø§Øª"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} Ù…Ù†Ø° Ø¯Ù‚Ø§Ø¦Ù‚"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Ø§Ù„ÙŠÙˆÙ…"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -163,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Ø®Ø·Ø£"
 
@@ -176,123 +252,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø²Ø§Ù„Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† Ø§Ù„ØªØµØ±ÙŠØ Ø¨Ø§Ù„ØªÙˆØµÙ„"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ø´ÙˆØ±Ùƒ Ù…Ø¹Ùƒ ÙˆÙ…Ø¹ Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø© {group} Ù…Ù† Ù‚Ø¨Ù„ {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Ø´ÙˆØ±Ùƒ Ù…Ø¹Ùƒ Ù…Ù† Ù‚Ø¨Ù„ {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Ø´Ø§Ø±Ùƒ Ù…Ø¹"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Ø´Ø§Ø±Ùƒ Ù…Ø¹ Ø±Ø§Ø¨Ø·"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "ØÙ…Ø§ÙŠØ© ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "ØªØ¹ÙŠÙŠÙ† ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Ù…Ø´Ø§Ø±ÙƒØ© Ø¹Ø¨Ø± Ø§Ù„Ø¨Ø±ÙŠØ¯ Ø§Ù„Ø¥Ù„ÙƒØªØ±ÙˆÙ†ÙŠ:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ù„Ø¹Ø«ÙˆØ± Ø¹Ù„Ù‰ Ø£ÙŠ Ø´Ø®Øµ"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Ù„Ø§ ÙŠØ³Ù…Ø Ø¨Ø¹Ù…Ù„ÙŠØ© Ø¥Ø¹Ø§Ø¯Ø© Ø§Ù„Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Ø´ÙˆØ±Ùƒ ÙÙŠ {item} Ù…Ø¹ {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "Ø§Ù„ØªØØ±ÙŠØ± Ù…Ø³Ù…ÙˆØ"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "Ø¶Ø¨Ø· Ø§Ù„ÙˆØµÙˆÙ„"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "Ø¥Ù†Ø´Ø§Ø¡"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "ØªØØ¯ÙŠØ«"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "ØØ°Ù"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Ù…ØÙ…ÙŠ Ø¨ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© Ø¥Ø²Ø§Ù„Ø© ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "ØØµÙ„ Ø®Ø·Ø£ Ø¹Ù†Ø¯ Ø¹Ù…Ù„ÙŠØ© ØªØ¹ÙŠÙŠÙ† ØªØ§Ø±ÙŠØ® Ø¥Ù†ØªÙ‡Ø§Ø¡ Ø§Ù„ØµÙ„Ø§ØÙŠØ©"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "Ø¥Ø¹Ø§Ø¯Ø© ØªØ¹ÙŠÙŠÙ† ÙƒÙ„Ù…Ø© Ø³Ø± ownCloud"
@@ -444,87 +538,11 @@ msgstr "Ø®Ø§Ø¯Ù… Ù‚Ø§Ø¹Ø¯Ø© Ø§Ù„Ø¨ÙŠØ§Ù†Ø§Øª"
 msgid "Finish setup"
 msgstr "Ø§Ù†Ù‡Ø§Ø¡ Ø§Ù„ØªØ¹Ø¯ÙŠÙ„Ø§Øª"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Ø§Ù„Ø§ØØ¯"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Ø§Ù„Ø£Ø«Ù†ÙŠÙ†"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Ø§Ù„Ø«Ù„Ø§Ø«Ø§Ø¡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Ø§Ù„Ø§Ø±Ø¨Ø¹Ø§Ø¡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Ø§Ù„Ø®Ù…ÙŠØ³"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Ø§Ù„Ø¬Ù…Ø¹Ù‡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Ø§Ù„Ø³Ø¨Øª"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Ø´Ø¨Ø§Ø·"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Ø¢Ø°Ø§Ø±"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Ù†ÙŠØ³Ø§Ù†"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Ø£ÙŠØ§Ø±"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "ØØ²ÙŠØ±Ø§Ù†"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "ØªÙ…ÙˆØ²"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Ø¢Ø¨"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Ø£ÙŠÙ„ÙˆÙ„"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø§ÙˆÙ„"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "ØªØ´Ø±ÙŠÙ† Ø§Ù„Ø«Ø§Ù†ÙŠ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "ÙƒØ§Ù†ÙˆÙ† Ø§Ù„Ø§ÙˆÙ„"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Ø®Ø¯Ù…Ø§Øª Ø§Ù„ÙˆØ¨ ØªØØª ØªØµØ±ÙÙƒ"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Ø§Ù„Ø®Ø±ÙˆØ¬"
 
@@ -566,17 +584,3 @@ msgstr "Ø§Ù„ØªØ§Ù„ÙŠ"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "ØªØØ°ÙŠØ± Ø£Ù…Ø§Ù†!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Ø§Ù„Ø±Ø¬Ø§Ø¡ Ø§Ù„ØªØÙ‚Ù‚ Ù…Ù† ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø±. <br/>Ù…Ù† Ø§Ù„Ù…Ù…ÙƒÙ† Ø£ØÙŠØ§Ù†Ø§Ù‹ Ø£Ù† Ù†Ø·Ù„Ø¨ Ù…Ù†Ùƒ Ø¥Ø¹Ø§Ø¯Ø© Ø¥Ø¯Ø®Ø§Ù„ ÙƒÙ„Ù…Ø© Ø§Ù„Ø³Ø± Ù…Ø±Ø© Ø£Ø®Ø±Ù‰."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ØªØÙ‚ÙŠÙ‚"
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index b57cae5c403b907fa66a9840d5fd5103cbb79039..7063715d2f049cb66de260dde1f8ee27311e6416 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -32,46 +32,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "ØªÙ… ØªØ±ÙÙŠØ¹ Ø§Ù„Ù…Ù„ÙØ§Øª Ø¨Ù†Ø¬Ø§Ø."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ØØ¬Ù… Ø§Ù„Ù…Ù„Ù Ø§Ù„Ø°ÙŠ ØªØ±ÙŠØ¯ ØªØ±ÙÙŠØ¹Ù‡ Ø£Ø¹Ù„Ù‰ Ù…Ù…Ø§ MAX_FILE_SIZE ÙŠØ³Ù…Ø Ø¨Ù‡ ÙÙŠ ÙˆØ§Ø¬Ù‡Ø© Ø§Ù„ HTML."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "ØªÙ… ØªØ±ÙÙŠØ¹ Ø¬Ø²Ø¡ Ù…Ù† Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„Ø°ÙŠ ØªØ±ÙŠØ¯ ØªØ±ÙÙŠØ¹Ù‡Ø§ ÙÙ‚Ø·"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ù„Ù… ÙŠØªÙ… ØªØ±ÙÙŠØ¹ Ø£ÙŠ Ù…Ù† Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Ø§Ù„Ù…Ø¬Ù„Ø¯ Ø§Ù„Ù…Ø¤Ù‚Øª ØºÙŠØ± Ù…ÙˆØ¬ÙˆØ¯"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -79,11 +79,11 @@ msgstr ""
 msgid "Files"
 msgstr "Ø§Ù„Ù…Ù„ÙØ§Øª"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Ø¥Ù„ØºØ§Ø¡ Ù…Ø´Ø§Ø±ÙƒØ©"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Ù…ØØ°ÙˆÙ"
 
@@ -91,137 +91,151 @@ msgstr "Ù…ØØ°ÙˆÙ"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Ø¥ØºÙ„Ù‚"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ø§Ù„Ø§Ø³Ù…"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "ØØ¬Ù…"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Ù…Ø¹Ø¯Ù„"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Ø¥Ø±ÙØ¹"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -270,36 +284,32 @@ msgstr "Ù…Ø¬Ù„Ø¯"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ø¥Ø±ÙØ¹"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ù„Ø§ ÙŠÙˆØ¬Ø¯ Ø´ÙŠØ¡ Ù‡Ù†Ø§. Ø¥Ø±ÙØ¹ Ø¨Ø¹Ø¶ Ø§Ù„Ù…Ù„ÙØ§Øª!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ØªØÙ…ÙŠÙ„"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "ØØ¬Ù… Ø§Ù„ØªØ±ÙÙŠØ¹ Ø£Ø¹Ù„Ù‰ Ù…Ù† Ø§Ù„Ù…Ø³Ù…ÙˆØ"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ØØ¬Ù… Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„ØªÙŠ ØªØ±ÙŠØ¯ ØªØ±ÙÙŠØ¹Ù‡Ø§ Ø£Ø¹Ù„Ù‰ Ù…Ù† Ø§Ù„Ù…Ø³Ù…ÙˆØ Ø¹Ù„Ù‰ Ø§Ù„Ø®Ø§Ø¯Ù…."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ar/files_encryption.po b/l10n/ar/files_encryption.po
index 1d2de3d76f25f02ec56327c1e6cd898ee02b90b8..a3c4ed89318b321d46d5db1445bc1aaf20873c46 100644
--- a/l10n/ar/files_encryption.po
+++ b/l10n/ar/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 13:20+0000\n"
-"Last-Translator: TYMAH <hussein-atef@hotmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Ø§Ù„ØªØ´ÙÙŠØ±"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ø§Ø³ØªØ¨Ø¹Ø¯ Ø£Ù†ÙˆØ§Ø¹ Ø§Ù„Ù…Ù„ÙØ§Øª Ø§Ù„ØªØ§Ù„ÙŠØ© Ù…Ù† Ø§Ù„ØªØ´ÙÙŠØ±"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ù„Ø§ Ø´ÙŠØ¡"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "ØªÙØ¹ÙŠÙ„ Ø§Ù„ØªØ´ÙÙŠØ±"
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index 3b32ba6301d182aeb5791ba565cf20c8b0651ec3..8224c627626c4c0306f51044b5f13ebf6a7b64f4 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/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: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 19:47+0000\n"
-"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "Ø¥Ù†Ù‡Ø§Ø¡ ØªØ§Ø±ÙŠØ® Ø§Ù„Ø¥Ù†ØªÙ‡Ø§Ø¡ Ù„Ø¬Ù…ÙŠØ¹ Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Ø§Ù„Ø³Ø¬Ù„ Ø§Ù„Ø²Ù…Ù†ÙŠ"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Ø§Ù„Ø¥ØµØ¯Ø§Ø±Ø§Øª"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Ù‡Ø°Ù‡ Ø§Ù„Ø¹Ù…Ù„ÙŠØ© Ø³ØªÙ‚ÙˆÙ… Ø¨Ø¥Ù„ØºØ§Ø¡ Ø¬Ù…ÙŠØ¹ Ø¥ØµØ¯Ø§Ø±Ø§Øª Ø§Ù„Ù†Ø³Ø® Ø§Ù„Ø§ØØªÙŠØ§Ø·ÙŠ Ù„Ù„Ù…Ù„ÙØ§Øª"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Ø£ØµØ¯Ø±Ø© Ø§Ù„Ù…Ù„ÙØ§Øª"
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 6a9cdf2b15b73d7bfd2fe87e9dbd9ca8d36494b5..dbb9b7359cf675ceb72e88508745f3e9af5da02b 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: 2012-12-24 00:11+0100\n"
-"PO-Revision-Date: 2012-12-23 19:00+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -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:287
+#: app.php:301
 msgid "Help"
 msgstr "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "Ø´Ø®ØµÙŠ"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "ØªØ¹Ø¯ÙŠÙ„Ø§Øª"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Ø§Ù„Ù…Ø³ØªØ®Ø¯Ù…ÙŠÙ†"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
@@ -57,11 +57,15 @@ msgstr ""
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Ù„Ù… ÙŠØªÙ… Ø§Ù„ØªØ£ÙƒØ¯ Ù…Ù† Ø§Ù„Ø´Ø®ØµÙŠØ© Ø¨Ù†Ø¬Ø§Ø"
 
@@ -81,55 +85,55 @@ msgstr "Ù…Ø¹Ù„ÙˆÙ…Ø§Øª Ø¥Ø¶Ø§ÙÙŠØ©"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Ù…Ù†Ø° Ø«ÙˆØ§Ù†ÙŠ"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "Ù…Ù†Ø° Ø¯Ù‚ÙŠÙ‚Ø©"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Ø§Ù„ÙŠÙˆÙ…"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 1da68062efd37ca68e70fa0ae701fc74d33d5565..a2178a82e0a941e308a5a13298650aabccf2a863 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "ØªÙØ¹ÙŠÙ„"
 msgid "Saving..."
 msgstr "ØÙØ¸"
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -102,15 +102,15 @@ msgstr "Ø£Ø¶Ù ØªØ·Ø¨ÙŠÙ‚Ø§ØªÙƒ"
 msgid "More Apps"
 msgstr "Ø§Ù„Ù…Ø²ÙŠØ¯ Ù…Ù† Ø§Ù„ØªØ·Ø¨ÙŠÙ‚Ø§Øª"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Ø¥Ø®ØªØ± ØªØ·Ø¨ÙŠÙ‚Ø§Ù‹"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Ø±Ø§Ø¬Ø¹ ØµÙØØ© Ø§Ù„ØªØ·Ø¨ÙŠÙ‚ Ø¹Ù„Ù‰ apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ØªØ±Ø®ÙŠØµ Ù…Ù† Ù‚Ø¨Ù„ <span class=\"author\"></span>"
 
@@ -159,7 +159,7 @@ msgstr "ØªØÙ…ÙŠÙ„ Ø¹Ù…ÙŠÙ„ Ø¢Ù†Ø¯Ø±ÙˆÙŠØ¯"
 msgid "Download iOS Client"
 msgstr "ØªØÙ…ÙŠÙ„ Ø¹Ù…ÙŠÙ„ Ø¢ÙŠ Ø£Ùˆ Ø£Ø³"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ÙƒÙ„Ù…Ø§Øª Ø§Ù„Ø³Ø±"
 
@@ -229,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ø§Ù„Ø§Ø³Ù…"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Ù…Ø¬Ù…ÙˆØ¹Ø§Øª"
 
@@ -245,26 +245,30 @@ msgstr "Ø§Ù†Ø´Ø¦"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Ø´ÙŠØ¡ Ø¢Ø®Ø±"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ø¬Ù…ÙˆØ¹Ø©"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "ØØ°Ù"
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 7aaa90abe9ae0b99a62369bbe308ab6a28fa7bb8..ab2b79bb6c3c02c673e74e48e78375a0bf627f6a 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: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 19:40+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "Ø§Ù„Ù…Ø³Ø§Ø¹Ø¯Ø©"
diff --git a/l10n/ar/user_webdavauth.po b/l10n/ar/user_webdavauth.po
index ac1aa5b4a5eb3a27bca0ee870047f58621557312..92180c70e7e732243150b61d63008667f99d7c42 100644
--- a/l10n/ar/user_webdavauth.po
+++ b/l10n/ar/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 19:22+0000\n"
-"Last-Translator: aboodilankaboot <shiningmoon25@gmail.com>\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: ar\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "Ø§Ù„Ø±Ø§Ø¨Ø·: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/bg_BG/core.po b/l10n/bg_BG/core.po
index e00f6c9d1d36072ba289b1d73652afe20c34454e..1e66831c050d5e54511ab2e0a1038fe02540d333 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,59 +83,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:33
+msgid "January"
+msgstr ""
+
+#: js/config.php:33
+msgid "February"
+msgstr ""
+
+#: js/config.php:33
+msgid "March"
+msgstr ""
+
+#: js/config.php:33
+msgid "April"
+msgstr ""
+
+#: js/config.php:33
+msgid "May"
+msgstr ""
+
+#: js/config.php:33
+msgid "June"
+msgstr ""
+
+#: js/config.php:33
+msgid "July"
+msgstr ""
+
+#: js/config.php:33
+msgid "August"
+msgstr ""
+
+#: js/config.php:33
+msgid "September"
+msgstr ""
+
+#: js/config.php:33
+msgid "October"
+msgstr ""
+
+#: js/config.php:33
+msgid "November"
+msgstr ""
+
+#: js/config.php:33
+msgid "December"
+msgstr ""
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ñ‡Ð°Ñ"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Ð´Ð½ÐµÑ"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
@@ -165,10 +241,10 @@ 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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
-msgstr ""
+msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
@@ -178,123 +254,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð°"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -446,87 +540,11 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr ""
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "ÑƒÐµÐ± ÑƒÑÐ»ÑƒÐ³Ð¸ Ð¿Ð¾Ð´ Ð’Ð°Ñˆ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr ""
 
@@ -568,17 +586,3 @@ msgstr ""
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 14ac7f3c7b690da17a5ba298b57bb8ab88db35aa..2de8fabb1430969b08e895b1fab3d6ee7b8fcd66 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:05+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Ð›Ð¸Ð¿ÑÐ²Ð° Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð° Ð¿Ð°Ð¿ÐºÐ°"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Files"
 msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ðµ"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
 
@@ -92,137 +92,151 @@ msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
 msgid "Rename"
 msgstr "ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ðµ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ð¿Ñ€ÐµÐ¿Ð¾ÐºÑ€Ð¸Ð²Ð°Ð½Ðµ"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð·"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Ð²ÑŠÐ·Ñ‚Ð°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ÐšÐ°Ñ‡Ð²Ð°Ð½ÐµÑ‚Ð¾ Ðµ ÑÐ¿Ñ€ÑÐ½Ð¾."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ð˜Ð¼Ðµ"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÐ½Ð¾"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ÐšÐ°Ñ‡Ð²Ð°Ð½Ðµ"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -271,36 +285,32 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ÐšÐ°Ñ‡Ð²Ð°Ð½Ðµ"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "ÐÑÐ¼Ð° Ð½Ð¸Ñ‰Ð¾ Ñ‚ÑƒÐº. ÐšÐ°Ñ‡ÐµÑ‚Ðµ Ð½ÐµÑ‰Ð¾."
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Ð˜Ð·Ñ‚ÐµÐ³Ð»ÑÐ½Ðµ"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ð¹Ð»ÑŠÑ‚ ÐºÐ¾Ð¹Ñ‚Ð¾ ÑÑ‚Ðµ Ð¸Ð·Ð±Ñ€Ð°Ð»Ð¸ Ð·Ð° ÐºÐ°Ñ‡Ð²Ð°Ð½Ðµ Ðµ Ð¿Ñ€ÐµÐºÐ°Ð»ÐµÐ½Ð¾ Ð³Ð¾Ð»ÑÐ¼"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/bg_BG/files_encryption.po b/l10n/bg_BG/files_encryption.po
index c5aca629edcbd2b698dbd9ff85e683156197ba4c..8e5aeda08422f498ccfb832ccee319000ea49764 100644
--- a/l10n/bg_BG/files_encryption.po
+++ b/l10n/bg_BG/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 20:51+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "ÐšÑ€Ð¸Ð¿Ñ‚Ð¸Ñ€Ð°Ð½Ðµ"
 
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° ÐºÑ€Ð¸Ð¿Ñ‚Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸ Ñ‚Ð¸Ð¿Ð¾Ð²Ðµ Ð¾Ñ‚ ÐºÑ€Ð¸Ð¿Ñ‚Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾"
 
-#: templates/settings.php:7
+#: templates/settings.php:71
 msgid "None"
 msgstr "ÐÑÐ¼Ð°"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "Ð˜Ð·ÐºÐ»ÑŽÑ‡Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸ Ñ‚Ð¸Ð¿Ð¾Ð²Ðµ Ð¾Ñ‚ ÐºÑ€Ð¸Ð¿Ñ‚Ð¸Ñ€Ð°Ð½ÐµÑ‚Ð¾"
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index 0b1e6c052700365e77a4040e241804de4be17665..be466434b93a47ae246712f876fb1fd0dc1611c6 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 20:49+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Ð¢Ð¾Ð²Ð° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ Ñ‰Ðµ Ð¸Ð·Ñ‚Ñ€Ð¸Ðµ Ð²ÑÐ¸Ñ‡ÐºÐ¸ Ð½Ð°Ð»Ð¸Ñ‡Ð½Ð¸ Ð°Ñ€Ñ…Ð¸Ð²Ð½Ð¸ Ð²ÐµÑ€ÑÐ¸Ð¸ Ð½Ð° Ð’Ð°ÑˆÐ¸Ñ‚Ðµ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 516eee347abde8696579c1660a5703d995b74c24..5e238d11362d3f766871de481fabd0a47a97a2fd 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 20:43+0000\n"
-"Last-Translator: Stefan Ilivanov <ilivanov@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+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"
@@ -58,11 +58,15 @@ msgstr "ÐÐ°Ð·Ð°Ð´ ÐºÑŠÐ¼ Ñ„Ð°Ð¹Ð»Ð¾Ð²ÐµÑ‚Ðµ"
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Ð’ÑŠÐ·Ð½Ð¸ÐºÐ½Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸ÑÑ‚Ð°"
 
@@ -82,55 +86,55 @@ msgstr "Ð¢ÐµÐºÑÑ‚"
 msgid "Images"
 msgstr "Ð¡Ð½Ð¸Ð¼ÐºÐ¸"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð¸"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ 1 Ñ‡Ð°Ñ"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ %d Ñ‡Ð°ÑÐ°"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Ð´Ð½ÐµÑ"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð´Ð½Ð¸"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸ÑÑ‚ Ð¼ÐµÑÐµÑ†"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Ð¿Ñ€ÐµÐ´Ð¸ %d Ð¼ÐµÑÐµÑ†Ð°"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c660334fdfcdaab8f2da2820117f3110ce9e7562..71667fa12a16365d34e9f538865919b9cc8e2f12 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -62,7 +62,7 @@ msgstr ""
 
 #: ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
-msgstr ""
+msgstr "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ð·Ð°ÑÐ²ÐºÐ°"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
@@ -90,7 +90,7 @@ msgstr "Ð’ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾"
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr ""
 
@@ -102,15 +102,15 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»Ð°"
 
@@ -229,11 +229,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ð˜Ð¼Ðµ"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¸"
 
@@ -245,26 +245,30 @@ msgstr ""
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index e45d6efc2fb865c5f1229e8a3a39b01e5a3995a6..0ec1c50339e36282d573fd8abd7734a3928b7c85 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/bg_BG/user_webdavauth.po b/l10n/bg_BG/user_webdavauth.po
index 05f8507380b13d79f4b094c73a859cb7de5c033e..c541db398fdb852ae9f80a3e6f2fa46d27932459 100644
--- a/l10n/bg_BG/user_webdavauth.po
+++ b/l10n/bg_BG/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-09 00:04+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: bg_BG\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/bn_BD/core.po b/l10n/bn_BD/core.po
index 4fd2a01432408f4816eb9abe28fe35dfd9f56a61..dcaa8094dcda2f1675a97d7f19e0cf5c727986e5 100644
--- a/l10n/bn_BD/core.po
+++ b/l10n/bn_BD/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "%s à¦¨à¦¾à¦®à§‡à¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦•à¦Ÿà¦¾ à¦«à¦¾à¦‡à¦² à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s à¦¨à¦¾à¦®à§‡à¦° à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦•à¦Ÿà¦¾ à¦«à§‹à¦²à§à¦¡à¦¾à¦° à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr "à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¾à¦° à¦œà¦¨à§à¦¯ à¦•à§‹à¦¨ à¦•à§à¦¯à¦¾à¦Ÿà§‡
 msgid "Error removing %s from favorites."
 msgstr "à¦ªà§à¦°à¦¿à§Ÿ à¦¥à§‡à¦•à§‡ %s à¦¸à¦°à¦¿à§Ÿà§‡ à¦«à§‡à¦²à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡à¥¤"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "à¦°à¦¬à¦¿à¦¬à¦¾à¦°"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "à¦¸à§‹à¦®à¦¬à¦¾à¦°"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "à¦®à¦™à§à¦—à¦²à¦¬à¦¾à¦°"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "à¦¬à§à¦§à¦¬à¦¾à¦°"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "à¦¬à§ƒà¦¹à¦·à§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "à¦¶à§à¦•à§à¦°à¦¬à¦¾à¦°"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "à¦¶à¦¨à¦¿à¦¬à¦¾à¦°"
+
+#: js/config.php:33
+msgid "January"
+msgstr "à¦œà¦¾à¦¨à§à§Ÿà¦¾à¦°à¦¿"
+
+#: js/config.php:33
+msgid "February"
+msgstr "à¦«à§‡à¦¬à§à¦°à§à§Ÿà¦¾à¦°à¦¿"
+
+#: js/config.php:33
+msgid "March"
+msgstr "à¦®à¦¾à¦°à§à¦š"
+
+#: js/config.php:33
+msgid "April"
+msgstr "à¦à¦ªà§à¦°à¦¿à¦²"
+
+#: js/config.php:33
+msgid "May"
+msgstr "à¦®à§‡"
+
+#: js/config.php:33
+msgid "June"
+msgstr "à¦œà§à¦¨"
+
+#: js/config.php:33
+msgid "July"
+msgstr "à¦œà§à¦²à¦¾à¦‡"
+
+#: js/config.php:33
+msgid "August"
+msgstr "à¦…à¦—à¦¾à¦·à§à¦Ÿ"
+
+#: js/config.php:33
+msgid "September"
+msgstr "à¦¸à§‡à¦ªà§à¦Ÿà§‡à¦®à§à¦¬à¦°"
+
+#: js/config.php:33
+msgid "October"
+msgstr "à¦…à¦•à§à¦Ÿà§‹à¦¬à¦°"
+
+#: js/config.php:33
+msgid "November"
+msgstr "à¦¨à¦à§‡à¦®à§à¦¬à¦°"
+
+#: js/config.php:33
+msgid "December"
+msgstr "à¦¡à¦¿à¦¸à§‡à¦®à§à¦¬à¦°"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "à¦¨à¦¿à§Ÿà¦¾à¦®à¦•à¦¸à¦®à§‚à¦¹"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "à¦†à¦œ"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "à¦—à¦¤à¦•à¦¾à¦²"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} à¦¦à¦¿à¦¨ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "à¦—à¦¤à¦®à¦¾à¦¸"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} à¦®à¦¾à¦¸ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "à¦®à¦¾à¦¸ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "à¦—à¦¤ à¦¬à¦›à¦°"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "à¦¬à¦›à¦° à¦ªà§‚à¦°à§à¦¬à§‡"
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "à¦¸à¦®à¦¸à§à¦¯à¦¾"
 
@@ -175,123 +251,141 @@ msgstr "à¦…à§à¦¯à¦¾à¦ªà§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿  à¦¸à§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ
 msgid "The required file {file} is not installed!"
 msgstr "à¦†à¦¬à¦¶à§à¦¯à¦¿à¦• {file} à¦Ÿà¦¿ à¦¸à¦‚à¦¸à§à¦¥à¦¾à¦ªà¦¿à¦¤ à¦¨à§‡à¦‡ !"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡  "
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "à¦…à¦¨à§à¦®à¦¤à¦¿à¦¸à¦®à§‚à¦¹  à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} à¦†à¦ªà¦¨à¦¾à¦° à¦à¦¬à¦‚ {group} à¦—à§‹à¦·à§à¦ à§€à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "{owner} à¦†à¦ªà¦¨à¦¾à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§‡à¦›à§‡à¦¨"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "à¦¯à¦¾à¦¦à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "à¦²à¦¿à¦‚à¦•à§‡à¦° à¦¸à¦¾à¦¥à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦¸à§à¦°à¦•à§à¦·à¦¿à¦¤"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "à¦¬à§à¦¯à¦•à§à¦¤à¦¿à¦° à¦¸à¦¾à¦¥à§‡ à¦‡-à¦®à§‡à¦‡à¦² à¦¯à§à¦•à§à¦¤ à¦•à¦°"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "à¦ªà¦¾à¦ à¦¾à¦“"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à§à¦¨"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦–"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "à¦‡-à¦®à§‡à¦‡à¦²à§‡à¦° à¦®à¦¾à¦§à§à¦¯à¦®à§‡ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à§à¦¨à¦ƒ"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "à¦•à§‹à¦¨ à¦¬à§à¦¯à¦•à§à¦¤à¦¿ à¦–à§à¦à¦œà§‡ à¦ªà¦¾à¦“à§Ÿà¦¾ à¦—à§‡à¦² à¦¨à¦¾"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "à¦ªà§‚à¦¨à¦ƒà¦°à¦¾à§Ÿ à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à§Ÿ"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "{user} à¦à¦° à¦¸à¦¾à¦¥à§‡ {item} à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "à¦¸à¦®à§à¦ªà¦¾à¦¦à¦¨à¦¾ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à¦¬à§‡à¦¨"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "à¦…à¦§à¦¿à¦—à¦®à§à¦¯à¦¤à¦¾ à¦¨à¦¿à§Ÿà¦¨à§à¦¤à§à¦°à¦£"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "à¦¤à§ˆà¦°à§€ à¦•à¦°à§à¦¨"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§à¦§à¦¨ à¦•à¦°"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "à¦®à§à¦›à§‡ à¦«à§‡à¦²"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦à¦¦à§à¦¬à¦¾à¦°à¦¾ à¦¸à§à¦°à¦•à§à¦·à¦¿à¦¤"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£ à¦¹à¦“à§Ÿà¦¾à¦° à¦¤à¦¾à¦°à¦¿à¦– à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "à¦ªà¦¾à¦ à¦¾à¦¨à§‹ à¦¹à¦šà§à¦›à§‡......"
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦ à¦ªà§‚à¦¨à¦ƒà¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£"
@@ -443,87 +537,11 @@ msgstr "à¦¡à¦¾à¦Ÿà¦¾à¦¬à§‡à¦œ à¦¹à§‹à¦¸à§à¦Ÿ"
 msgid "Finish setup"
 msgstr "à¦¸à§‡à¦Ÿà¦†à¦ª à¦¸à§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ à¦•à¦°"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "à¦°à¦¬à¦¿à¦¬à¦¾à¦°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "à¦¸à§‹à¦®à¦¬à¦¾à¦°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "à¦®à¦™à§à¦—à¦²à¦¬à¦¾à¦°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "à¦¬à§à¦§à¦¬à¦¾à¦°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "à¦¬à§ƒà¦¹à¦·à§à¦ªà¦¤à¦¿à¦¬à¦¾à¦°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "à¦¶à§à¦•à§à¦°à¦¬à¦¾à¦°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "à¦¶à¦¨à¦¿à¦¬à¦¾à¦°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "à¦œà¦¾à¦¨à§à§Ÿà¦¾à¦°à¦¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "à¦«à§‡à¦¬à§à¦°à§à§Ÿà¦¾à¦°à¦¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "à¦®à¦¾à¦°à§à¦š"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "à¦à¦ªà§à¦°à¦¿à¦²"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "à¦®à§‡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "à¦œà§à¦¨"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "à¦œà§à¦²à¦¾à¦‡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "à¦…à¦—à¦¾à¦·à§à¦Ÿ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "à¦¸à§‡à¦ªà§à¦Ÿà§‡à¦®à§à¦¬à¦°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "à¦…à¦•à§à¦Ÿà§‹à¦¬à¦°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "à¦¨à¦à§‡à¦®à§à¦¬à¦°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "à¦¡à¦¿à¦¸à§‡à¦®à§à¦¬à¦°"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "à¦“à§Ÿà§‡à¦¬ à¦¸à¦¾à¦°à§à¦à¦¿à¦¸à§‡à¦° à¦¨à¦¿à§Ÿà¦¨à§à¦¤à§à¦°à¦£ à¦†à¦ªà¦¨à¦¾à¦° à¦¹à¦¾à¦¤à§‡à¦° à¦®à§à¦ à§‹à§Ÿ"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "à¦ªà§à¦°à¦¸à§à¦¥à¦¾à¦¨"
 
@@ -565,17 +583,3 @@ msgstr "à¦ªà¦°à¦¬à¦°à§à¦¤à§€"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "%s à¦à¦¾à¦°à§à¦¸à¦¨à§‡ ownCloud à¦ªà¦°à¦¿à¦¬à¦°à§à¦§à¦¨ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦à¦œà¦¨à§à¦¯ à¦•à¦¿à¦›à§ à¦¸à¦®à§Ÿ à¦ªà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤"
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "à¦¨à¦¿à¦°à¦¾à¦ªà¦¤à§à¦¤à¦¾à¦¬à¦¿à¦·à§Ÿà¦• à¦¸à¦¤à¦°à§à¦•à¦¬à¦¾à¦£à§€"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "à¦¯à¦¾à¦šà¦¾à¦‡ à¦•à¦°"
diff --git a/l10n/bn_BD/files.po b/l10n/bn_BD/files.po
index 33908fc14e1c952cea794c16ed8d95f3a7d380b9..5d15b8d5bad40a6ed74f78257565ca93db0c932d 100644
--- a/l10n/bn_BD/files.po
+++ b/l10n/bn_BD/files.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-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:05+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -32,46 +32,46 @@ msgstr "%s  à¦•à§‡ à¦¸à§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦° à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¹
 msgid "Unable to rename file"
 msgstr "à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¨à¦¾à¦® à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¨ à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¹à¦²à§‹ à¦¨à¦¾"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "à¦•à§‹à¦¨ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à§Ÿ à¦¨à¦¿à¥¤ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦…à¦œà§à¦žà¦¾à¦¤à¥¤"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "à¦•à§‹à¦¨ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¨à§‡à¦‡, à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦¸à§à¦¸à¦®à§à¦ªà¦¨à§à¦¨ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾  à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ php.ini à¦¤à§‡ à¦¬à¦°à§à¦£à¦¿à¦¤  upload_max_filesize à¦¨à¦¿à¦°à§à¦¦à§‡à¦¶à¦¿à¦¤ à¦†à§Ÿà¦¤à¦¨ à¦…à¦¤à¦¿à¦•à§à¦°à¦® à¦•à¦°à¦›à§‡à¦ƒ"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ HTML  à¦«à¦°à§à¦®à§‡ à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤  MAX_FILE_SIZE à¦¨à¦¿à¦°à§à¦¦à§‡à¦¶à¦¿à¦¤ à¦¸à¦°à§à¦¬à§‹à¦šà§à¦š à¦†à¦•à¦¾à¦° à¦…à¦¤à¦¿à¦•à§à¦°à¦® à¦•à¦°à§‡à¦›à§‡ "
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ à¦†à¦‚à¦¶à¦¿à¦• à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "à¦•à§‹à¦¨ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à§Ÿ à¦¨à¦¿"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "à¦…à¦¸à§à¦¥à¦¾à§Ÿà§€ à¦«à§‹à¦²à§à¦¡à¦¾à¦° à¦–à§‹à§Ÿà¦¾ à¦—à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "à¦¡à¦¿à¦¸à§à¦•à§‡ à¦²à¦¿à¦–à¦¤à§‡ à¦¬à§à¦¯à¦°à§à¦¥"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "à¦¯à¦¥à§‡à¦·à§à¦  à¦ªà¦°à¦¿à¦®à¦¾à¦£ à¦¸à§à¦¥à¦¾à¦¨ à¦¨à§‡à¦‡"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "à¦à§à¦² à¦¡à¦¿à¦°à§‡à¦•à§à¦Ÿà¦°à¦¿"
 
@@ -79,11 +79,11 @@ msgstr "à¦à§à¦² à¦¡à¦¿à¦°à§‡à¦•à§à¦Ÿà¦°à¦¿"
 msgid "Files"
 msgstr "à¦«à¦¾à¦‡à¦²"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² "
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "à¦®à§à¦›à§‡ à¦«à§‡à¦²"
 
@@ -91,137 +91,151 @@ msgstr "à¦®à§à¦›à§‡ à¦«à§‡à¦²"
 msgid "Rename"
 msgstr "à¦ªà§‚à¦¨à¦ƒà¦¨à¦¾à¦®à¦•à¦°à¦£"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} à¦Ÿà¦¿ à¦¬à¦¿à¦¦à§à¦¯à¦®à¦¾à¦¨"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "à¦¨à¦¾à¦® à¦¸à§à¦ªà¦¾à¦°à¦¿à¦¶ à¦•à¦°à§à¦¨"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "à¦¬à¦¾à¦¤à¦¿à¦²"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name}  à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "à¦•à§à¦°à¦¿à§Ÿà¦¾ à¦ªà§à¦°à¦¤à§à¦¯à¦¾à¦¹à¦¾à¦°"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} à¦•à§‡ {old_name} à¦¨à¦¾à¦®à§‡ à¦ªà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "{files} à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "à¦Ÿà¦¿ à¦à¦•à¦Ÿà¦¿ à¦…à¦¨à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à¦¾à¦®à¥¤"
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦«à¦¾à¦à¦•à¦¾ à¦°à¦¾à¦–à¦¾ à¦¯à¦¾à¦¬à§‡ à¦¨à¦¾à¥¤"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦¸à¦ à¦¿à¦• à¦¨à§Ÿ,  '\\', '/', '<', '>', ':', '\"', '|', '?' à¦à¦¬à¦‚  '*'  à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦¨à§Ÿà¥¤"
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP- à¦«à¦¾à¦‡à¦² à¦¤à§ˆà¦°à§€ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦à¦œà¦¨à§à¦¯ à¦•à¦¿à¦›à§ à¦¸à¦®à§Ÿ à¦†à¦¬à¦¶à§à¦¯à¦•à¥¤"
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "à¦†à¦ªà¦¨à¦¾à¦° à¦«à¦¾à¦‡à¦²à¦Ÿà¦¿ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¸à¦®à§à¦à¦¬ à¦¹à¦²à§‹ à¦¨à¦¾, à¦•à§‡à¦¨à¦¨à¦¾ à¦à¦Ÿà¦¿ à¦¹à§Ÿ à¦à¦•à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦° à¦•à¦¿à¦‚à¦¬à¦¾ à¦à¦° à¦†à¦•à¦¾à¦° à§¦ à¦¬à¦¾à¦‡à¦Ÿ"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¤à§‡ à¦¸à¦®à¦¸à§à¦¯à¦¾ "
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "à¦¬à¦¨à§à¦§"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "à¦®à§à¦²à¦¤à§à¦¬à¦¿"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡à¥¤"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦šà¦²à¦®à¦¾à¦¨à¥¤ à¦à¦‡ à¦ªà§ƒà¦·à§à¦ à¦¾ à¦ªà¦°à¦¿à¦¤à§à¦¯à¦¾à¦— à¦•à¦°à¦²à§‡ à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°à¦¾ à¦¹à¦¬à§‡à¥¤"
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL à¦«à¦¾à¦à¦•à¦¾ à¦°à¦¾à¦–à¦¾ à¦¯à¦¾à¦¬à§‡ à¦¨à¦¾à¥¤"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "à¦«à§‹à¦²à§à¦¡à¦¾à¦°à§‡à¦° à¦¨à¦¾à¦®à¦Ÿà¦¿ à¦¸à¦ à¦¿à¦• à¦¨à§Ÿà¥¤ 'à¦à¦¾à¦—à¦¾à¦à¦¾à¦—à¦¿ à¦•à¦°à¦¾' à¦¶à§à¦§à§à¦®à¦¾à¦¤à§à¦° Owncloud  à¦à¦° à¦œà¦¨à§à¦¯ à¦¸à¦‚à¦°à¦•à§à¦·à¦¿à¦¤à¥¤"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦² à¦¸à§à¦•à§à¦¯à¦¾à¦¨ à¦•à¦°à¦¾ à¦¹à§Ÿà§‡à¦›à§‡"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "à¦¸à§à¦•à§à¦¯à¦¾à¦¨ à¦•à¦°à¦¾à¦° à¦¸à¦®à§Ÿ à¦¸à¦®à¦¸à§à¦¯à¦¾ à¦¦à§‡à¦–à¦¾ à¦¦à¦¿à§Ÿà§‡à¦›à§‡"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "à¦¨à¦¾à¦®"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "à¦†à¦•à¦¾à¦°"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "à¦ªà¦°à¦¿à¦¬à¦°à§à¦¤à¦¿à¦¤"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "à§§à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} à¦Ÿà¦¿ à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "à§§à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} à¦Ÿà¦¿ à¦«à¦¾à¦‡à¦²"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "à¦†à¦ªà¦²à§‹à¦¡"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "à¦«à¦¾à¦‡à¦² à¦¹à§à¦¯à¦¾à¦°à§à¦¡à¦²à¦¿à¦‚"
@@ -270,36 +284,32 @@ msgstr "à¦«à§‹à¦²à§à¦¡à¦¾à¦°"
 msgid "From link"
 msgstr " à¦²à¦¿à¦‚à¦• à¦¥à§‡à¦•à§‡"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "à¦†à¦ªà¦²à§‹à¦¡"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡ à¦¬à¦¾à¦¤à¦¿à¦² à¦•à¦°"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "à¦à¦–à¦¾à¦¨à§‡ à¦•à¦¿à¦›à§à¦‡ à¦¨à§‡à¦‡à¥¤ à¦•à¦¿à¦›à§ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à§à¦¨ !"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "à¦†à¦ªà¦²à§‹à¦¡à§‡à¦° à¦†à¦•à¦¾à¦°à¦Ÿà¦¿ à¦…à¦¨à§‡à¦• à¦¬à§œ"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "à¦†à¦ªà¦¨à¦¿ à¦à¦‡ à¦¸à¦¾à¦°à§à¦à¦¾à¦°à§‡ à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾à¦° à¦œà¦¨à§à¦¯ à¦…à¦¨à§à¦®à§‹à¦¦à¦¿à¦¤ à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¸à¦°à§à¦¬à§‹à¦šà§à¦š à¦†à¦•à¦¾à¦°à§‡à¦° à¦šà§‡à§Ÿà§‡ à¦¬à§ƒà¦¹à¦¦à¦¾à¦•à¦¾à¦° à¦«à¦¾à¦‡à¦² à¦†à¦ªà¦²à§‹à¦¡ à¦•à¦°à¦¾à¦° à¦šà§‡à¦·à§à¦Ÿà¦¾ à¦•à¦°à¦›à§‡à¦¨ "
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "à¦«à¦¾à¦‡à¦²à¦—à§à¦²à§‹ à¦¸à§à¦•à§à¦¯à¦¾à¦¨ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡, à¦¦à§Ÿà¦¾ à¦•à¦°à§‡ à¦…à¦ªà§‡à¦•à§à¦·à¦¾ à¦•à¦°à§à¦¨à¥¤"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "à¦¬à¦°à§à¦¤à¦®à¦¾à¦¨ à¦¸à§à¦•à§à¦¯à¦¾à¦¨à¦¿à¦‚"
diff --git a/l10n/bn_BD/files_encryption.po b/l10n/bn_BD/files_encryption.po
index 8c13e55a14a9df11706aaa2d2e584f5864d570df..4be08a9e00f7ba38ad86f9e960ec37300b4ca85d 100644
--- a/l10n/bn_BD/files_encryption.po
+++ b/l10n/bn_BD/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:15+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +17,66 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "à¦¸à¦‚à¦•à§‡à¦¤à¦¾à§Ÿà¦¨"
 
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "à¦¸à¦‚à¦•à§‡à¦¤à¦¾à§Ÿà¦¨ à¦¸à¦•à§à¦°à¦¿à§Ÿ à¦•à¦°"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "à¦¸à¦‚à¦•à§‡à¦¤à¦¾à§Ÿà¦¨ à¦¥à§‡à¦•à§‡ à¦¨à¦¿à¦®à§à¦¨à§‹à¦•à§à¦¤ à¦§à¦°à¦£à¦¸à¦®à§‚à¦¹ à¦¬à¦¾à¦¦ à¦¦à¦¾à¦“"
 
-#: templates/settings.php:7
+#: templates/settings.php:71
 msgid "None"
 msgstr "à¦•à§‹à¦¨à¦Ÿà¦¿à¦‡ à¦¨à§Ÿ"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "à¦¸à¦‚à¦•à§‡à¦¤à¦¾à§Ÿà¦¨ à¦¥à§‡à¦•à§‡ à¦¨à¦¿à¦®à§à¦¨à§‹à¦•à§à¦¤ à¦§à¦°à¦£à¦¸à¦®à§‚à¦¹ à¦¬à¦¾à¦¦ à¦¦à¦¾à¦“"
diff --git a/l10n/bn_BD/files_versions.po b/l10n/bn_BD/files_versions.po
index 51865f07105d1c42a22c2d999a686a2e3986fc92..2af1e4efdd9c35db55cdaa98e63fed3afaf5af18 100644
--- a/l10n/bn_BD/files_versions.po
+++ b/l10n/bn_BD/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-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-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"
 "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,22 +17,10 @@ msgstr ""
 "Language: bn_BD\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "à¦¸à¦®à¦¸à§à¦¤ à¦à¦¾à¦°à§à¦¸à¦¨ à¦®à§‡à§Ÿà¦¾à¦¦à§‹à¦¤à§à¦¤à§€à¦°à§à¦£"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "à¦‡à¦¤à¦¿à¦¹à¦¾à¦¸"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "à¦à¦¾à¦°à§à¦¸à¦¨"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "à¦à¦Ÿà¦¿ à¦†à¦ªà¦¨à¦¾à¦° à¦¬à¦¿à¦¦à§à¦¯à¦®à¦¾à¦¨  à¦«à¦¾à¦‡à¦²à§‡à¦° à¦¸à¦®à¦¸à§à¦¤ à¦¬à§à¦¯à¦¾à¦•-à¦†à¦ª à¦à¦¾à¦°à§à¦¸à¦¨ à¦®à§à¦›à§‡ à¦«à§‡à¦²à¦¬à§‡à¥¤"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "à¦«à¦¾à¦‡à¦² à¦à¦¾à¦°à§à¦¸à¦¨ à¦•à¦°à¦¾"
diff --git a/l10n/bn_BD/lib.po b/l10n/bn_BD/lib.po
index 0c8865693c2c1eb2ee6fef56fd0c8f59cc4cf546..da90c84c9766ad8100dad6e2cacd0a1b7b1f9f0b 100644
--- a/l10n/bn_BD/lib.po
+++ b/l10n/bn_BD/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-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:27+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,11 +57,15 @@ msgstr "à¦«à¦¾à¦‡à¦²à§‡ à¦«à¦¿à¦°à§‡ à¦šà¦²"
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "à¦…à¦¨à§à¦®à§‹à¦¦à¦¨ à¦˜à¦Ÿà¦¿à¦¤ à¦¸à¦®à¦¸à§à¦¯à¦¾"
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "à¦¸à§‡à¦•à§‡à¦¨à§à¦¡ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "à§§ à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d à¦®à¦¿à¦¨à¦¿à¦Ÿ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 à¦˜à¦¨à§à¦Ÿà¦¾ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "à¦†à¦œ"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "à¦—à¦¤à¦•à¦¾à¦²"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d  à¦¦à¦¿à¦¨ à¦ªà§‚à¦°à§à¦¬à§‡"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "à¦—à¦¤ à¦®à¦¾à¦¸"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "à¦—à¦¤ à¦¬à¦›à¦°"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "à¦¬à¦›à¦° à¦ªà§‚à¦°à§à¦¬à§‡"
 
diff --git a/l10n/bn_BD/settings.po b/l10n/bn_BD/settings.po
index 34c75b953eb4ca5125836f910ca3f25bdfcc8b52..681984d8be61689bb8740961050f5c56449b4081 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bengali (Bangladesh) (http://www.transifex.com/projects/p/owncloud/language/bn_BD/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "à¦¸à¦•à§à¦°à¦¿à§Ÿ "
 msgid "Saving..."
 msgstr "à¦¸à¦‚à¦°à¦•à§à¦·à¦£ à¦•à¦°à¦¾ à¦¹à¦šà§à¦›à§‡.."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -100,15 +100,15 @@ msgstr "à¦†à¦ªà¦¨à¦¾à¦° à¦…à§à¦¯à¦¾à¦ªà¦Ÿà¦¿ à¦¯à§‹à¦— à¦•à¦°à§à¦¨"
 msgid "More Apps"
 msgstr "à¦†à¦°à¦“ à¦…à§à¦¯à¦¾à¦ª"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "à¦…à§à¦¯à¦¾à¦ª à¦¨à¦¿à¦°à§à¦¬à¦¾à¦šà¦¨ à¦•à¦°à§à¦¨"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com à¦ à¦…à§à¦¯à¦¾à¦ªà§à¦²à¦¿à¦•à§‡à¦¸à¦¨ à¦ªà§ƒà¦·à§à¦ à¦¾ à¦¦à§‡à¦–à§à¦¨"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-à¦²à¦¾à¦‡à¦¸à§‡à¦¨à§à¦¸à¦§à¦¾à¦°à§€ <span class=\"author\"></span>"
 
@@ -157,7 +157,7 @@ msgstr "à¦…à§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à§Ÿà§‡à¦¡ à¦•à§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ à¦¡à¦¾
 msgid "Download iOS Client"
 msgstr "iOS à¦•à§à¦²à¦¾à§Ÿà§‡à¦¨à§à¦Ÿ à¦¡à¦¾à¦‰à¦¨à¦²à§‹à¦¡ à¦•à¦°à§à¦¨"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "à¦•à§‚à¦Ÿà¦¶à¦¬à§à¦¦"
 
@@ -227,11 +227,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "à¦°à¦¾à¦®"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "à¦—à§‹à¦·à§à¦ à§€à¦¸à¦®à§‚à¦¹"
 
@@ -243,26 +243,30 @@ msgstr "à¦¤à§ˆà¦°à§€ à¦•à¦°"
 msgid "Default Storage"
 msgstr "à¦ªà§‚à¦°à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦¸à¦‚à¦°à¦•à§à¦·à¦£à¦¾à¦—à¦¾à¦°"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "à¦…à¦¸à§€à¦®"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "à¦…à¦¨à§à¦¯à¦¾à¦¨à§à¦¯"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "à¦—à§‹à¦·à§à¦ à§€ à¦ªà§à¦°à¦¶à¦¾à¦¸à¦•"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "à¦¸à¦‚à¦°à¦•à§à¦·à¦£à¦¾à¦—à¦¾à¦°"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "à¦ªà§‚à¦°à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "à¦®à§à¦›à§‡ à¦«à§‡à¦²"
diff --git a/l10n/bn_BD/user_ldap.po b/l10n/bn_BD/user_ldap.po
index 75f4261e13f382768bd29f66dbf2fb7a5425767b..68b329db2f13f97da725bc6f292e80683f35ec6f 100644
--- a/l10n/bn_BD/user_ldap.po
+++ b/l10n/bn_BD/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-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:27+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr "SSL à¦†à¦¬à¦¶à§à¦¯à¦•  à¦¨à¦¾ à¦¹à¦²à§‡  à¦†à¦ªà¦¨à¦¿ à¦à¦‡ à¦ªà§à¦°
 msgid "Base DN"
 msgstr "à¦à¦¿à¦¤à§à¦¤à¦¿  DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "à¦¸à§à¦šà¦¾à¦°à§ à¦Ÿà§à¦¯à¦…à¦¬à§‡ à¦—à¦¿à§Ÿà§‡ à¦†à¦ªà¦¨à¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦à¦¬à¦‚ à¦—à§‹à¦·à§à¦ à§€à¦¸à¦®à§‚à¦¹à§‡à¦° à¦œà¦¨à§à¦¯ à¦à¦¿à¦¤à§à¦¤à¦¿ DN à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦£ à¦•à¦°à¦¤à§‡ à¦ªà¦¾à¦°à§‡à¦¨à¥¤"
@@ -114,10 +118,18 @@ msgstr "à¦ªà§‹à¦°à§à¦Ÿ"
 msgid "Base User Tree"
 msgstr "à¦à¦¿à¦¤à§à¦¤à¦¿ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à¦¿ à¦¬à§ƒà¦•à§à¦·à¦¾à¦•à¦¾à¦°à§‡"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "à¦à¦¿à¦¤à§à¦¤à¦¿ à¦—à§‹à¦·à§à¦ à§€ à¦¬à§ƒà¦•à§à¦·à¦¾à¦•à¦¾à¦°à§‡"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "à¦—à§‹à¦·à§à¦ à§€-à¦¸à¦¦à¦¸à§à¦¯ à¦¸à¦‚à¦¸à§à¦¥à¦¾à¦ªà¦¨"
diff --git a/l10n/bn_BD/user_webdavauth.po b/l10n/bn_BD/user_webdavauth.po
index 99d191a99b1030a9b5400c16c81cc6b412a827ac..6bf9079f19bb0285006dd7aa490cbdde3efaed66 100644
--- a/l10n/bn_BD/user_webdavauth.po
+++ b/l10n/bn_BD/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 10:07+0000\n"
-"Last-Translator: Shubhra Paul <paul_shubhra@yahoo.com>\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"
 "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"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: bn_BD\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 "URL:http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 94ad3349ff3e5bf98241f407ff4cba1165071117..3fe5703a2f8aced4422525ac866a1237e5241197 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <joan@montane.cat>, 2012.
+#  <rcalvoi@yahoo.com>, 2013.
 #   <rcalvoi@yahoo.com>, 2011-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -19,24 +20,24 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "L'usuari %s ha compartit un fitxer amb vÃ³s"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "L'usuari %s ha compartit una carpeta amb vÃ³s"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,59 +82,135 @@ msgstr "No hi ha categories per eliminar."
 msgid "Error removing %s from favorites."
 msgstr "Error en eliminar %s dels preferits."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Diumenge"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Dilluns"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Dimarts"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Dijous"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Divendres"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Gener"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Febrer"
+
+#: js/config.php:33
+msgid "March"
+msgstr "MarÃ§"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Abril"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maig"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juny"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juliol"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Agost"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Setembre"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Octubre"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembre"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Desembre"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "fa {minutes} minuts"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "fa {hours} hores"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "avui"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "ahir"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "fa {days} dies"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "el mes passat"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "fa {months} mesos"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "l'any passat"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "anys enrere"
 
@@ -163,8 +240,8 @@ msgid "The object type is not specified."
 msgstr "No s'ha especificat el tipus d'objecte."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Error"
 
@@ -176,123 +253,141 @@ msgstr "No s'ha especificat el nom de l'aplicaciÃ³."
 msgid "The required file {file} is not installed!"
 msgstr "El fitxer requerit {file} no estÃ  instalÂ·lat!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Error en deixar de compartir"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Error en canviar els permisos"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartit amb vos i amb el grup {group} per {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Compartit amb vos per {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Comparteix amb"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Comparteix amb enllaÃ§"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Protegir amb contrasenya"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Contrasenya"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "EnllaÃ§ per correu electrÃ³nic amb la persona"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Envia"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Estableix la data d'expiraciÃ³"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Data d'expiraciÃ³"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Comparteix per correu electrÃ²nic"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "No s'ha trobat ningÃº"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Compartit en {item} amb {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "pot editar"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "control d'accÃ©s"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "actualitza"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data d'expiraciÃ³"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Error en establir la data d'expiraciÃ³"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Enviant..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "El correu electrÃ³nic s'ha enviat"
 
+#: 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 "L'actualitzaciÃ³ ha estat incorrecte. Comuniqueu aquest error a <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">la comunitat ownCloud</a>."
+
+#: 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."
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "estableix de nou la contrasenya Owncloud"
@@ -444,87 +539,11 @@ msgstr "Ordinador central de la base de dades"
 msgid "Finish setup"
 msgstr "Acaba la configuraciÃ³"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Diumenge"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Dilluns"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Dimarts"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Dimecres"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Dijous"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Divendres"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Dissabte"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Gener"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Febrer"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "MarÃ§"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Abril"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maig"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juny"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juliol"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Agost"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Setembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Octubre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Novembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Desembre"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Surt"
 
@@ -566,17 +585,3 @@ msgstr "segÃ¼ent"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "S'estÃ  actualitzant ownCloud a la versiÃ³ %s, pot trigar una estona."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "AvÃs de seguretat!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Comproveu la vostra contrasenya. <br/>Per raons de seguretat se us pot demanar escriure de nou la vostra contrasenya."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Comprova"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 159d191a912fb20866a7af3c3938a5e5b641ed4b..fef5f92725c84f71ff0d1029856e13f7940898b6 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -7,14 +7,15 @@
 #   <joan@montane.cat>, 2012.
 #   <josep_tomas@hotmail.com>, 2012.
 # Josep TomÃ s <jtomas.binsoft@gmail.com>, 2012.
+#  <rcalvoi@yahoo.com>, 2013.
 #   <rcalvoi@yahoo.com>, 2011-2013.
 #   <sacoo2@hotmail.com>, 2013.
 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 07:36+0000\n"
+"POT-Creation-Date: 2013-01-28 00:04+0100\n"
+"PO-Revision-Date: 2013-01-27 15:24+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"
@@ -37,46 +38,46 @@ msgstr " No s'ha pogut moure %s"
 msgid "Unable to rename file"
 msgstr "No es pot canviar el nom del fitxer"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "No s'ha carregat cap fitxer. Error desconegut"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "El fitxer s'ha pujat correctament"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Lâ€™arxiu que voleu carregar supera el mÃ xim definit en la directiva upload_max_filesize del php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El fitxer de pujada excedeix la directiva MAX_FILE_SIZE especificada al formulari HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "El fitxer nomÃ©s s'ha pujat parcialment"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "El fitxer no s'ha pujat"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "S'ha perdut un fitxer temporal"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Ha fallat en escriure al disc"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr "No hi ha prou espai disponible"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Directori no vÃ lid."
 
@@ -84,11 +85,11 @@ msgstr "Directori no vÃ lid."
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -96,137 +97,151 @@ msgstr "Suprimeix"
 msgid "Rename"
 msgstr "Reanomena"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} ja existeix"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "sugereix un nom"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "cancelÂ·la"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "s'ha substituÃ¯t {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "desfÃ©s"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "s'ha substituÃ¯t {old_name} per {new_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "no compartits {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "eliminats {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' Ã©s un nom no vÃ lid per un fitxer."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "El nom del fitxer no pot ser buit."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "El nÃ³m no Ã©s vÃ lid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "s'estan generant fitxers ZIP, pot trigar una estona."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "El vostre espai d'emmagatzemament Ã©s ple, els fitxers ja no es poden actualitzar o sincronitzar!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "El vostre espai d'emmagatzemament Ã©s gairebÃ© ple ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Error en la pujada"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Tanca"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Pendents"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fitxer pujant"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} fitxers en pujada"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancelÂ·lat."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "La URL no pot ser buida"
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} fitxers escannejats"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "error durant l'escaneig"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} carpetes"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 fitxer"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} fitxers"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Puja"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "GestiÃ³ de fitxers"
@@ -275,36 +290,32 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Des d'enllaÃ§"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Puja"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "CancelÂ·la la pujada"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquÃ. Pugeu alguna cosa!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "La pujada Ã©s massa gran"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Actualment escanejant"
diff --git a/l10n/ca/files_encryption.po b/l10n/ca/files_encryption.po
index 98571697a6ab318a1beeb8d6671615e8f855f12b..78e847f6e1e461c59593796cccf2dcacb39c0e34 100644
--- a/l10n/ca/files_encryption.po
+++ b/l10n/ca/files_encryption.po
@@ -3,33 +3,82 @@
 # 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-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 18:30+0000\n"
+"POT-Creation-Date: 2013-01-26 00:09+0100\n"
+"PO-Revision-Date: 2013-01-25 08:06+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Connecteu-vos al client ownCloud i canvieu la contrasenya d'encriptaciÃ³ per completar la conversiÃ³."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "s'ha commutat a l'encriptaciÃ³ per part del client"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Canvia la contrasenya d'encriptaciÃ³ per la d'accÃ©s"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Comproveu les contrasenyes i proveu-ho de nou."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "No s'ha pogut canviar la contrasenya d'encriptaciÃ³ de fitxers per la d'accÃ©s"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Escolliu el mode d'encriptaciÃ³:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "EncriptaciÃ³ per part del client (mÃ©s segura perÃ² fa impossible l'accÃ©s a les dades des de la interfÃcie web)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "EncriptaciÃ³ per part del servidor (permet accedir als fitxers des de la interfÃcie web i des del client d'escriptori)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Cap (sense encriptaciÃ³)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Important: quan seleccioneu un mode d'encriptaciÃ³ no hi ha manera de canviar-lo de nou"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "EspecÃfic per usuari (permet que l'usuari ho decideixi)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Encriptatge"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Exclou els tipus de fitxers segÃ¼ents de l'encriptatge"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Cap"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activa l'encriptatge"
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index 4bd9bdf45c900f165ebf439b4381cedb501c37fa..0db50601e4c71c660a8574315a0bda62cd523863 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.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-10-10 02:04+0200\n"
-"PO-Revision-Date: 2012-10-09 07:30+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\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"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expira totes les versions"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historial"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versions"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "AixÃ² eliminarÃ  totes les versions de cÃ²pia de seguretat dels vostres fitxers"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Fitxers de Versions"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 0bdb8f916ecacb15dc8e816aab11ec2af1e86e6c..965da96ee3144d01868ef0d9d31b91299136d182 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2012.
+#   <rcalvoi@yahoo.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 08:22+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 09:24+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,51 +18,55 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "ConfiguraciÃ³"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Usuaris"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Aplicacions"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "AdministraciÃ³"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP estÃ  desactivada."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "no s'ha pogut determinar"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "L'aplicaciÃ³ no estÃ  habilitada"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Error d'autenticaciÃ³"
 
@@ -82,55 +86,55 @@ msgstr "Text"
 msgid "Images"
 msgstr "Imatges"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "fa %d minuts"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "fa 1 hora"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "fa %d hores"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "avui"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "ahir"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "fa %d dies"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "el mes passat"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "fa %d mesos"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "l'any passat"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "fa anys"
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 4d6dc883603ae595d28790273c69f3fd1a34f21f..1efd6df00e1215d86bbe39320e72522afd0ad016 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr "Activa"
 msgid "Saving..."
 msgstr "S'estÃ  desant..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "CatalÃ "
 
@@ -104,15 +104,15 @@ msgstr "Afegiu la vostra aplicaciÃ³"
 msgid "More Apps"
 msgstr "MÃ©s aplicacions"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Seleccioneu una aplicaciÃ³"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Mireu la pÃ gina d'aplicacions a apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>"
 
@@ -161,7 +161,7 @@ msgstr " Baixa el client per Android"
 msgid "Download iOS Client"
 msgstr "Baixa el client per iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Contrasenya"
 
@@ -231,11 +231,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nom"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grups"
 
@@ -247,26 +247,30 @@ msgstr "Crea"
 msgid "Default Storage"
 msgstr "Emmagatzemament per defecte"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "IlÂ·limitat"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Un altre"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grup Admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Emmagatzemament"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Per defecte"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Suprimeix"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 10b45cc32141c7c31075b4f5c721f91529d5a1d3..8cf04dcae1bdb068aa9e8d862a0e527688235ef8 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2012.
+#   <rcalvoi@yahoo.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-17 00:09+0100\n"
-"PO-Revision-Date: 2012-12-16 09:56+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 07:21+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"
@@ -27,9 +27,9 @@ msgstr "<b>AvÃs:</b> Les aplicacions user_ldap i user_webdavauth sÃ³n incompati
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>AvÃs:</b> El mÃ²dul  PHP LDAP necessari no estÃ  instalÂ·lat, el dorsal no funcionarÃ . Demaneu a l'administrador del sistema que l'instalÂ·li."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>AvÃs:</b> El mÃ²dul PHP LDAP no estÃ  instalÂ·lat, el dorsal no funcionarÃ . Demaneu a l'administrador del sistema que l'instalÂ·li."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -44,6 +44,10 @@ msgstr "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb
 msgid "Base DN"
 msgstr "DN Base"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Una DN Base per lÃnia"
+
 #: templates/settings.php:16
 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"
@@ -115,10 +119,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "Arbre base d'usuaris"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Una DN Base d'Usuari per lÃnia"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Arbre base de grups"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Una DN Base de Grup per lÃnia"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "AssociaciÃ³ membres-grup"
diff --git a/l10n/ca/user_webdavauth.po b/l10n/ca/user_webdavauth.po
index c7a053911dece922dc4f632982f95b628d5ee3c5..bd7df15438f42dbfd1dc3219f0fcd09768d8f727 100644
--- a/l10n/ca/user_webdavauth.po
+++ b/l10n/ca/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <rcalvoi@yahoo.com>, 2012.
+#   <rcalvoi@yahoo.com>, 2012-2013.
 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 09:21+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 07:22+0000\n"
 "Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "AutenticaciÃ³ WebDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud enviarÃ  les credencials d'usuari a aquesta URL. S'interpretarÃ  http 401 i http 403 com a credencials incorrectes i tots els altres codis com a credencials correctes."
+"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 enviarÃ  les credencials d'usuari a aquesta URL. Aquest endollable en comprova la resposta i interpretarÃ  els codis d'estat 401 i 403 com a credencials no vÃ lides, i qualsevol altra resposta com a credencials vÃ lides."
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index e6bfba8798cbea5d4aef661968816a9c842562a1..c65ccce2da5115aadb8631f4e66cf5c3c882b3b3 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "UÅ¾ivatel %s s vÃ¡mi sdÃlÃ soubor"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "UÅ¾ivatel %s s vÃ¡mi sdÃlÃ sloÅ¾ku"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "UÅ¾ivatel %s s vÃ¡mi sdÃlÃ soubor \"%s\". MÅ¯Å¾ete jej stÃ¡hnout zde: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,59 +83,135 @@ msgstr "Å½Ã¡dnÃ© kategorie nebyly vybrÃ¡ny ke smazÃ¡nÃ."
 msgid "Error removing %s from favorites."
 msgstr "Chyba pÅ™i odebÃrÃ¡nÃ %s z oblÃbenÃ½ch."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "NedÄ›le"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "PondÄ›lÃ"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "ÃšterÃ½"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "StÅ™eda"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "ÄŒtvrtek"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "PÃ¡tek"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Sobota"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Leden"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Ãšnor"
+
+#: js/config.php:33
+msgid "March"
+msgstr "BÅ™ezen"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Duben"
+
+#: js/config.php:33
+msgid "May"
+msgstr "KvÄ›ten"
+
+#: js/config.php:33
+msgid "June"
+msgstr "ÄŒerven"
+
+#: js/config.php:33
+msgid "July"
+msgstr "ÄŒervenec"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Srpen"
+
+#: js/config.php:33
+msgid "September"
+msgstr "ZÃ¡Å™Ã"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Å˜Ãjen"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Listopad"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Prosinec"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "NastavenÃ"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "pÅ™ed pÃ¡r vteÅ™inami"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "pÅ™ed minutou"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "pÅ™ed {minutes} minutami"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "pÅ™ed hodinou"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "pÅ™ed {hours} hodinami"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "vÄera"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "pÅ™ed {days} dny"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "minulÃ½ mesÃc"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "pÅ™ed {months} mÄ›sÃci"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "pÅ™ed mÄ›sÃci"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "pÅ™ed lety"
 
@@ -165,8 +241,8 @@ msgid "The object type is not specified."
 msgstr "NenÃ urÄen typ objektu."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Chyba"
 
@@ -178,123 +254,141 @@ msgstr "NenÃ urÄen nÃ¡zev aplikace."
 msgid "The required file {file} is not installed!"
 msgstr "PoÅ¾adovanÃ½ soubor {file} nenÃ nainstalovÃ¡n."
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Chyba pÅ™i sdÃlenÃ"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Chyba pÅ™i ruÅ¡enÃ sdÃlenÃ"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Chyba pÅ™i zmÄ›nÄ› oprÃ¡vnÄ›nÃ"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "S VÃ¡mi a skupinou {group} sdÃlÃ {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "S VÃ¡mi sdÃlÃ {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "SdÃlet s"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "SdÃlet s odkazem"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "ChrÃ¡nit heslem"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Odeslat osobÄ› odkaz e-mailem"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Odeslat"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Nastavit datum vyprÅ¡enÃ platnosti"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Datum vyprÅ¡enÃ platnosti"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "SdÃlet e-mailem:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Å½Ã¡dnÃ lidÃ© nenalezeni"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "SdÃlenÃ jiÅ¾ sdÃlenÃ© poloÅ¾ky nenÃ povoleno"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "SdÃleno v {item} s {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "ZruÅ¡it sdÃlenÃ"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "lze upravovat"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "Å™ÃzenÃ pÅ™Ãstupu"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "vytvoÅ™it"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "aktualizovat"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "smazat"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "sdÃlet"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "ChrÃ¡nÄ›no heslem"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Chyba pÅ™i odstraÅˆovÃ¡nÃ data vyprÅ¡enÃ platnosti"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Chyba pÅ™i nastavenÃ data vyprÅ¡enÃ platnosti"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "OdesÃlÃ¡m..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "E-mail odeslÃ¡n"
 
+#: 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 "Aktualizace neprobÄ›hla ÃºspÄ›Å¡nÄ›. Nahlaste prosÃm problÃ©m do <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">evidence chyb ownCloud</a>"
+
+#: js/update.js:18
+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
 msgid "ownCloud password reset"
 msgstr "ObnovenÃ hesla pro ownCloud"
@@ -446,87 +540,11 @@ msgstr "Hostitel databÃ¡ze"
 msgid "Finish setup"
 msgstr "DokonÄit nastavenÃ"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "NedÄ›le"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "PondÄ›lÃ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "ÃšterÃ½"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "StÅ™eda"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "ÄŒtvrtek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "PÃ¡tek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Sobota"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Leden"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Ãšnor"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "BÅ™ezen"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Duben"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "KvÄ›ten"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "ÄŒerven"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "ÄŒervenec"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Srpen"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "ZÃ¡Å™Ã"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Å˜Ãjen"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Listopad"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Prosinec"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "webovÃ© sluÅ¾by pod VaÅ¡Ã kontrolou"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "OdhlÃ¡sit se"
 
@@ -568,17 +586,3 @@ msgstr "nÃ¡sledujÃcÃ"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Aktualizuji ownCloud na verzi %s, bude to chvÃli trvat."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "BezpeÄnostnÃ upozornÄ›nÃ."
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "OvÄ›Å™te, prosÃm, svÃ© heslo. <br/>Z bezpeÄnostnÃch dÅ¯vodÅ¯ mÅ¯Å¾ete bÃ½t obÄas poÅ¾Ã¡dÃ¡ni o jeho opÄ›tovnÃ© zadÃ¡nÃ."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "OvÄ›Å™it"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index c5417ef8688b4f8f7e8ae286353ed1c2030c2608..de2fbc84153482fd0e76fb6860fad5e39e92901b 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 08:32+0000\n"
+"POT-Creation-Date: 2013-01-29 00:04+0100\n"
+"PO-Revision-Date: 2013-01-28 07:07+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"
@@ -34,46 +34,46 @@ msgstr "Nelze pÅ™esunout %s"
 msgid "Unable to rename file"
 msgstr "Nelze pÅ™ejmenovat soubor"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Soubor nebyl odeslÃ¡n. NeznÃ¡mÃ¡ chyba"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Soubor byl odeslÃ¡n ÃºspÄ›Å¡nÄ›"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "OdesÃlanÃ½ soubor pÅ™esahuje velikost upload_max_filesize povolenou v php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "OdeslanÃ½ soubor pÅ™esÃ¡hl svou velikostÃ parametr MAX_FILE_SIZE specifikovanÃ½ v formulÃ¡Å™i HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Soubor byl odeslÃ¡n pouze ÄÃ¡steÄnÄ›"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Å½Ã¡dnÃ½ soubor nebyl odeslÃ¡n"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ChybÃ adresÃ¡Å™ pro doÄasnÃ© soubory"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ZÃ¡pis na disk selhal"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Nedostatek dostupnÃ©ho mÃsta"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Nedostatek dostupnÃ©ho ÃºloÅ¾nÃ©ho prostoru"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "NeplatnÃ½ adresÃ¡Å™"
 
@@ -81,11 +81,11 @@ msgstr "NeplatnÃ½ adresÃ¡Å™"
 msgid "Files"
 msgstr "Soubory"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "ZruÅ¡it sdÃlenÃ"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Smazat"
 
@@ -93,137 +93,151 @@ msgstr "Smazat"
 msgid "Rename"
 msgstr "PÅ™ejmenovat"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} jiÅ¾ existuje"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "nahradit"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "navrhnout nÃ¡zev"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "zruÅ¡it"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "nahrazeno {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "zpÄ›t"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "nahrazeno {new_name} s {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "sdÃlenÃ zruÅ¡eno pro {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "smazÃ¡no {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' je neplatnÃ½m nÃ¡zvem souboru."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "NÃ¡zev souboru nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ½ Å™etÄ›zec."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "NeplatnÃ½ nÃ¡zev, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generuji ZIP soubor, mÅ¯Å¾e to nÄ›jakou dobu trvat."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "VaÅ¡e ÃºloÅ¾iÅ¡tÄ› je plnÃ©, nelze aktualizovat ani synchronizovat soubory."
+
+#: js/files.js:82
+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:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Chyba odesÃlÃ¡nÃ"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "ZavÅ™Ãt"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ÄŒekajÃcÃ"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "odesÃlÃ¡ se 1 soubor"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: 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:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "OdesÃlÃ¡nÃ zruÅ¡eno."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL nemÅ¯Å¾e bÃ½t prÃ¡zdnÃ¡"
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "prozkoumÃ¡no {count} souborÅ¯"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "chyba pÅ™i prohledÃ¡vÃ¡nÃ"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "NÃ¡zev"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ZmÄ›nÄ›no"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 sloÅ¾ka"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} sloÅ¾ky"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 soubor"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} soubory"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Odeslat"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "ZachÃ¡zenÃ se soubory"
@@ -272,36 +286,32 @@ msgstr "SloÅ¾ka"
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Odeslat"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ZruÅ¡it odesÃlÃ¡nÃ"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Å½Ã¡dnÃ½ obsah. Nahrajte nÄ›co."
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "StÃ¡hnout"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "OdeslanÃ½ soubor je pÅ™ÃliÅ¡ velkÃ½"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledÃ¡vajÃ, prosÃm Äekejte."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "AktuÃ¡lnÃ prohledÃ¡vÃ¡nÃ"
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 96298cc22053a7baa9a8490efda9d1d72d057fdf..c26a7ff01255129cbfa909b785ceb065f14bff5e 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 13:37+0000\n"
+"POT-Creation-Date: 2013-01-24 00:06+0100\n"
+"PO-Revision-Date: 2013-01-23 20:21+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,18 +19,66 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "ProsÃm pÅ™ejdÄ›te na svÃ©ho klienta ownCloud a nastavte Å¡ifrovacÃ heslo pro dokonÄenÃ konverze."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "pÅ™epnuto na Å¡ifrovÃ¡nÃ na stranÄ› klienta"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "ZmÄ›nit Å¡ifrovacÃ heslo na pÅ™ihlaÅ¡ovacÃ"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Zkontrolujte, prosÃm, svÃ© heslo a zkuste to znovu."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Nelze zmÄ›nit Å¡ifrovacÃ heslo na pÅ™ihlaÅ¡ovacÃ."
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Vyberte reÅ¾im Å¡ifrovÃ¡nÃ:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Å ifrovÃ¡nÃ na stranÄ› klienta (nejbezpeÄnÄ›jÅ¡Ã ale neumoÅ¾Åˆuje vÃ¡m pÅ™istupovat k souborÅ¯m z webovÃ©ho rozhranÃ)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "Å ifrovÃ¡nÃ na stranÄ› serveru (umoÅ¾Åˆuje vÃ¡m pÅ™istupovat k souborÅ¯m pomocÃ webovÃ©ho rozhranÃ i aplikacÃ)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Å½Ã¡dnÃ½ (vÅ¯bec Å¾Ã¡dnÃ© Å¡ifrovÃ¡nÃ)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "DÅ¯leÅ¾itÃ©: jak si jednou vyberete reÅ¾im Å¡ifrovÃ¡nÃ nelze jej opÄ›tovnÄ› zmÄ›nit"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "DefinovÃ¡n uÅ¾ivatelem (umoÅ¾nÃ uÅ¾ivateli si vybrat)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Å ifrovÃ¡nÃ"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "PÅ™i Å¡ifrovÃ¡nÃ vynechat nÃ¡sledujÃcÃ typy souborÅ¯"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Å½Ã¡dnÃ©"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Povolit Å¡ifrovÃ¡nÃ"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index 2f109044074109aaf23a8c9f4e49206a96a1b723..3e62a18ee409eca29eb2d971c5e8dbe5806206c2 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.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-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 11:58+0000\n"
-"Last-Translator: TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "VyprÅ¡et vÅ¡echny verze"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historie"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Verze"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "OdstranÃ vÅ¡echny existujÃcÃ zÃ¡lohovanÃ© verze VaÅ¡ich souborÅ¯"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "VerzovÃ¡nÃ souborÅ¯"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index dd8693c6c82a4d92fc95fd439fb29f666dc8b3b3..55cc3d0f58c6b02c9dcaacc05bc1c7fdc5f3e403 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 10:08+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 11:01+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,51 +19,55 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "NÃ¡povÄ›da"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "OsobnÃ"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "NastavenÃ"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "UÅ¾ivatelÃ©"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Aplikace"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Administrace"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "StahovÃ¡nÃ ZIPu je vypnuto."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory musÃ bÃ½t stahovÃ¡ny jednotlivÄ›."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ZpÄ›t k souborÅ¯m"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "VybranÃ© soubory jsou pÅ™ÃliÅ¡ velkÃ© pro vytvoÅ™enÃ zip souboru."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "nelze zjistit"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplikace nenÃ povolena"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Chyba ovÄ›Å™enÃ"
 
@@ -83,55 +87,55 @@ msgstr "Text"
 msgid "Images"
 msgstr "ObrÃ¡zky"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "pÅ™ed vteÅ™inami"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "pÅ™ed 1 minutou"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "pÅ™ed %d minutami"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "pÅ™ed hodinou"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "pÅ™ed %d hodinami"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "dnes"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "vÄera"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "pÅ™ed %d dny"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "minulÃ½ mÄ›sÃc"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "PÅ™ed %d mÄ›sÃci"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "loni"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "pÅ™ed lety"
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 46a8fc5c515ee4b68bfb21c0c2d21e02f678b9e0..4157e0094b63d9a3c5ddd530f2e8bdef78526bec 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr "Povolit"
 msgid "Saving..."
 msgstr "UklÃ¡dÃ¡m..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "ÄŒesky"
 
@@ -105,15 +105,15 @@ msgstr "PÅ™idat VaÅ¡Ã aplikaci"
 msgid "More Apps"
 msgstr "VÃce aplikacÃ"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vyberte aplikaci"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "VÃce na strÃ¡nce s aplikacemi na apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencovÃ¡no <span class=\"author\"></span>"
 
@@ -162,7 +162,7 @@ msgstr "StÃ¡hnout klienta pro android"
 msgid "Download iOS Client"
 msgstr "StÃ¡hnout klienta pro iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Heslo"
 
@@ -232,11 +232,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "JmÃ©no"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -248,26 +248,30 @@ msgstr "VytvoÅ™it"
 msgid "Default Storage"
 msgstr "VÃ½chozÃ ÃºloÅ¾iÅ¡tÄ›"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "NeomezenÄ›"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "JinÃ¡"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "SprÃ¡va skupiny"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "ÃšloÅ¾iÅ¡tÄ›"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "VÃ½chozÃ"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Smazat"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 89d650bf77dde7990602aa6e575f7daa5dfca172..225c039f836e8cdf3ac596d2f3adbac520151720 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 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-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 15:30+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 11:09+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"
@@ -28,8 +28,8 @@ msgstr "<b>VarovÃ¡nÃ:</b> Aplikace user_ldap a user_webdavauth nejsou kompatibi
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
 msgstr "<b>VarovÃ¡nÃ:</b> nenÃ nainstalovÃ¡n LDAP modul pro PHP, podpÅ¯rnÃ¡ vrstva nebude fungovat. PoÅ¾Ã¡dejte, prosÃm, sprÃ¡vce systÃ©mu aby jej nainstaloval."
 
 #: templates/settings.php:15
@@ -45,6 +45,10 @@ msgstr "MÅ¯Å¾ete vynechat protokol, vyjma pokud poÅ¾adujete SSL. Tehdy zaÄnÄ›te
 msgid "Base DN"
 msgstr "ZÃ¡kladnÃ DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Jedna zÃ¡kladnÃ DN na Å™Ã¡dku"
+
 #: templates/settings.php:16
 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"
@@ -116,10 +120,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "ZÃ¡kladnÃ uÅ¾ivatelskÃ½ strom"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Jedna uÅ¾ivatelskÃ¡ zÃ¡kladnÃ DN na Å™Ã¡dku"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "ZÃ¡kladnÃ skupinovÃ½ strom"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Jedna skupinovÃ¡ zÃ¡kladnÃ DN na Å™Ã¡dku"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asociace Älena skupiny"
diff --git a/l10n/cs_CZ/user_webdavauth.po b/l10n/cs_CZ/user_webdavauth.po
index 3545665816d297de0f65cae174de44f7ec5e44d2..28b3d2f8f195622c352a2d3d9de5d44ff002be4e 100644
--- a/l10n/cs_CZ/user_webdavauth.po
+++ b/l10n/cs_CZ/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 19:51+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 09:06+0000\n"
 "Last-Translator: TomÃ¡Å¡ ChvÃ¡tal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "OvÄ›Å™enÃ WebDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud odeÅ¡le pÅ™ihlaÅ¡ovacÃ Ãºdaje uÅ¾ivatele na URL a z nÃ¡vratovÃ© hodnoty urÄÃ stav pÅ™ihlÃ¡Å¡enÃ. Http 401 a 403 vyhodnotÃ jako neplatnÃ© Ãºdaje a vÅ¡echny ostatnÃ jako ÃºspÄ›Å¡nÃ© pÅ™ihlÃ¡Å¡enÃ."
+"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 odeÅ¡le uÅ¾ivatelskÃ© Ãºdaje na zadanou URL. Plugin zkontroluje odpovÄ›Ä a povaÅ¾uje nÃ¡vratovou hodnotu HTTP 401 a 403 za neplatnÃ© Ãºdaje a vÅ¡echny ostatnÃ hodnoty jako platnÃ© pÅ™ihlaÅ¡ovacÃ Ãºdaje."
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 2c249dec3087ac31df26a60257ff8060654b36c8..4f1fdd3523e06e08a7c840c97164547e53a78b5d 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -5,9 +5,10 @@
 # Translators:
 #   <cronner@gmail.com>, 2012.
 #   <mikkelbjerglarsen@gmail.com>, 2011, 2012.
-# 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.
+# Rasmus Paasch <rasmuspaasch@gmail.com>, 2013.
 #   <simon@rosmi.dk>, 2012.
 # Thomas Tanghus <>, 2012.
 # Thomas Tanghus <thomas@tanghus.net>, 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -25,24 +26,24 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Bruger %s delte en fil med dig"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Bruger %s delte en mappe med dig"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "Bruger %s delte filen \"%s\" med dig. Den kan hentes her: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -87,59 +88,135 @@ msgstr "Ingen kategorier valgt"
 msgid "Error removing %s from favorites."
 msgstr "Fejl ved fjernelse af %s fra favoritter."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "SÃ¸ndag"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Mandag"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Tirsdag"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Fredag"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "LÃ¸rdag"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Marts"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maj"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "December"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} dage siden"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "sidste mÃ¥ned"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} mÃ¥neder siden"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "mÃ¥neder siden"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "sidste Ã¥r"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -169,8 +246,8 @@ msgid "The object type is not specified."
 msgstr "Objekttypen er ikke angivet."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Fejl"
 
@@ -182,123 +259,141 @@ msgstr "Den app navn er ikke angivet."
 msgid "The required file {file} is not installed!"
 msgstr "Den krÃ¦vede fil {file} er ikke installeret!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Fejl under annullering af deling"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Fejl under justering af rettigheder"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delt med dig og gruppen {group} af {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Delt med dig af {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Del med link"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Beskyt med adgangskode"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Kodeord"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "E-mail link til person"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "VÃ¦lg udlÃ¸bsdato"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "UdlÃ¸bsdato"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Del via email:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Ingen personer fundet"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "kan redigere"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "Adgangskontrol"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "opret"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "opdater"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "slet"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "del"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udlÃ¸bsdato"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Fejl under sÃ¦tning af udlÃ¸bsdato"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Sender ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "E-mail afsendt"
 
+#: 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 "Opdateringen blev ikke udfÃ¸rt korrekt. Rapporter venligst problemet til <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownClouds community</a>."
+
+#: js/update.js:18
+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
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
@@ -450,87 +545,11 @@ msgstr "Databasehost"
 msgid "Finish setup"
 msgstr "Afslut opsÃ¦tning"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "SÃ¸ndag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Mandag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Tirsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Fredag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "LÃ¸rdag"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Marts"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "December"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Log ud"
 
@@ -571,18 +590,4 @@ msgstr "nÃ¦ste"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sikkerhedsadvarsel!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Verificer din adgangskode.<br/>Af sikkerhedsÃ¥rsager kan du lejlighedsvist blive bedt om at indtaste din adgangskode igen."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificer"
+msgstr "Opdatere Owncloud til version %s, dette kan tage et stykke tid."
diff --git a/l10n/da/files.po b/l10n/da/files.po
index b2d80372d342bb271baf69b043caba9baf87a4c6..2654e4e323cd4836fba75392ced1cc0a72eaa908 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 #   <cronner@gmail.com>, 2012.
-# 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.
 #   <osos@openeyes.dk>, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 11:55+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"
@@ -28,69 +28,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kunne ikke flytte %s - der findes allerede en fil med dette navn"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Kunne ikke flytte %s"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Kunne ikke omdÃ¸be fil"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil blev uploadet. Ukendt fejl."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Der er ingen fejl, filen blev uploadet med success"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uploadede fil overskrider MAX_FILE_SIZE -direktivet som er specificeret i HTML-formularen"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uploadede file blev kun delvist uploadet"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ingen fil blev uploadet"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Mangler en midlertidig mappe"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Fejl ved skrivning til disk."
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr ""
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Der er ikke nok plads til rÃ¥dlighed"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "Ugyldig mappe."
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Slet"
 
@@ -98,137 +98,151 @@ msgstr "Slet"
 msgid "Rename"
 msgstr "OmdÃ¸b"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} eksisterer allerede"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "foreslÃ¥ navn"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "erstattede {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstattede {new_name} med {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "ikke delte {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "slettede {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' er et ugyldigt filnavn."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Filnavnet kan ikke stÃ¥ tomt."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "genererer ZIP-fil, det kan tage lidt tid."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres lÃ¦ngere!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Din opbevaringsplads er nÃ¦sten fyldt op ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Fejl ved upload"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Luk"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fil uploades"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} filer uploades"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URLen kan ikke vÃ¦re tom."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ugyldigt mappenavn. Brug af \"Shared\" er forbeholdt Owncloud"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} filer skannet"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "fejl under scanning"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Ã†ndret"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Upload"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "FilhÃ¥ndtering"
@@ -277,36 +291,32 @@ msgstr "Mappe"
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Upload"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Upload for stor"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlÃ¦st, vent venligst."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "IndlÃ¦ser"
diff --git a/l10n/da/files_encryption.po b/l10n/da/files_encryption.po
index bd1c9864514732a0237e25ec9899e78fd3003b0e..78a06bdcabc2fad19812780c41d5931d31cd7e4c 100644
--- a/l10n/da/files_encryption.po
+++ b/l10n/da/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>, 2013.
 #   <osos@openeyes.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-14 02:01+0200\n"
-"PO-Revision-Date: 2012-09-13 09:42+0000\n"
-"Last-Translator: osos <osos@openeyes.dk>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 12:03+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"
@@ -18,18 +19,66 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Skift venligst til din ownCloud-klient og skift krypteringskoden for at fuldfÃ¸re konverteringen."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "skiftet til kryptering pÃ¥ klientsiden"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Udskift krypteringskode til login-adgangskode"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Check adgangskoder og forsÃ¸g igen."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Kunne ikke udskifte krypteringskode med login-adgangskode"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "VÃ¦lg krypteringsform:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Kryptering pÃ¥ klientsiden (mere sikker, men udelukker adgang til dataene fra webinterfacet)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "Kryptering pÃ¥ serversiden (gÃ¸r det muligt at tilgÃ¥ filer fra webinterfacet sÃ¥vel som desktopklienten)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Ingen (ingen kryptering)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Vigtigt: NÃ¥r der er valgt krypteringsform, kan det ikke Ã¦ndres tilbage igen."
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "Brugerspecifik (lad brugeren bestemme)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ekskluder fÃ¸lgende filtyper fra kryptering"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ingen"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "AktivÃ©r kryptering"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 3e6898ddd4567f4670c4693be2069e716eb57525..847d3bda8aae6e450e04d65f74af96f914ad4b2a 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.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-09-26 02:02+0200\n"
-"PO-Revision-Date: 2012-09-25 14:07+0000\n"
-"Last-Translator: Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Lad alle versioner udlÃ¸be"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historik"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versioner"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dette vil slette alle eksisterende backupversioner af dine filer"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionering af filer"
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 187d797c533fb14b5f7dd346e1e3b7f6469f1001..5596da61c317db3bfc8e0f2d0e7aaa3e1f57be28 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -4,15 +4,15 @@
 # 
 # Translators:
 #   <cronner@gmail.com>, 2012.
-# Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>, 2012.
+# Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>, 2012-2013.
 #   <osos@openeyes.dk>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:11+0100\n"
-"PO-Revision-Date: 2012-12-23 21:58+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 11:52+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"
@@ -20,27 +20,27 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "HjÃ¦lp"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "Personlig"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Brugere"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
@@ -60,11 +60,15 @@ msgstr "Tilbage til Filer"
 msgid "Selected files too large to generate zip file."
 msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "kunne ikke fastslÃ¥s"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Programmet er ikke aktiveret"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Adgangsfejl"
 
@@ -84,55 +88,55 @@ msgstr "SMS"
 msgid "Images"
 msgstr "Billeder"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutter siden"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d timer siden"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "I dag"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "I gÃ¥r"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d dage siden"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Sidste mÃ¥ned"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d mÃ¥neder siden"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Sidste Ã¥r"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ã¥r siden"
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 314d85e23066f841c452991ff4c0b03ab0b32713..6df46a3c46c78c4f5e196b2699b83d075af98b5c 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +97,7 @@ msgstr "Aktiver"
 msgid "Saving..."
 msgstr "Gemmer..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Dansk"
 
@@ -109,15 +109,15 @@ msgstr "TilfÃ¸j din App"
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "VÃ¦lg en App"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikationens side pÃ¥ apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>"
 
@@ -166,7 +166,7 @@ msgstr "Hent Android Klient"
 msgid "Download iOS Client"
 msgstr "Hent iOS Klient"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Kodeord"
 
@@ -236,11 +236,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Navn"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupper"
 
@@ -252,26 +252,30 @@ msgstr "Ny"
 msgid "Default Storage"
 msgstr "Standard opbevaring"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "UbegrÃ¦nset"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Andet"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppe Administrator"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Opbevaring"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standard"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Slet"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 0aab1f4051957182289cde33de87a2e7183799e6..a0d0e27bed6d1bb59991e54a353917dd55b7f46e 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/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: 2012-12-26 00:10+0100\n"
-"PO-Revision-Date: 2012-12-25 19:52+0000\n"
-"Last-Translator: Daraiko <blah@blacksunset.dk>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,8 +31,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -48,6 +48,10 @@ msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i sÃ¥ fal
 msgid "Base DN"
 msgstr "Base DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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"
@@ -119,10 +123,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "Base Bruger TrÃ¦"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Group-Member association"
diff --git a/l10n/da/user_webdavauth.po b/l10n/da/user_webdavauth.po
index 73cb352861f236bc82345cdd888349b6f26dbaf0..32a2a3729ab90af29dd57d91636c64ec99146674 100644
--- a/l10n/da/user_webdavauth.po
+++ b/l10n/da/user_webdavauth.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <cronner@gmail.com>, 2012.
+# Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-24 00:10+0100\n"
-"PO-Revision-Date: 2012-12-23 22:14+0000\n"
-"Last-Translator: cronner <cronner@gmail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 12:07+0000\n"
+"Last-Translator: Morten Juhl-Johansen ZÃ¶lde-FejÃ©r <morten@writtenandread.net>\n"
 "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,13 +19,17 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV-godkendelse"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud vil sende brugeroplysningerne til denne webadresse er fortolker http 401 og http 403 som brugeroplysninger forkerte og alle andre koder som brugeroplysninger korrekte."
+"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 vil sende brugerens oplysninger til denne URL. Plugin'et registrerer responsen og fortolker HTTP-statuskoder 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 4eecaa3b8131804372fd26f89a921374910abed2..b9615f97a4a0394da700e7c234a8965acb2e7b94 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -11,7 +11,7 @@
 # I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <mail@felixmoeller.de>, 2012.
-# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012-2013.
 #   <markus.thiel@desico.de>, 2012.
 #   <m.fresel@sysangels.com>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -33,24 +33,24 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: 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"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s hat ein Verzeichnis fÃ¼r Dich freigegeben"
 
-#: ajax/share.php:88
+#: 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"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -95,59 +95,135 @@ msgstr "Es wurde keine Kategorien zum LÃ¶schen ausgewÃ¤hlt."
 msgid "Error removing %s from favorites."
 msgstr "Fehler beim Entfernen von %s von den Favoriten."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Montag"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Freitag"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Samstag"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "MÃ¤rz"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Dezember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "vor einer Minute"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -177,8 +253,8 @@ msgid "The object type is not specified."
 msgstr "Der Objekttyp ist nicht angegeben."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Fehler"
 
@@ -190,123 +266,141 @@ msgstr "Der App-Name ist nicht angegeben."
 msgid "The required file {file} is not installed!"
 msgstr "Die benÃ¶tigte Datei {file} ist nicht installiert."
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Fehler beim Freigeben"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Fehler beim Aufheben der Freigabe"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Fehler beim Ã„ndern der Rechte"
 
-#: js/share.js:151
+#: 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"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "{owner} hat dies fÃ¼r Dich freigegeben"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Freigeben fÃ¼r"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Ãœber einen Link freigeben"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Ãœber eine E-Mail freigeben:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "FÃ¼r {user} in {item} freigegeben"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "lÃ¶schen"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "freigeben"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Durch ein Passwort geschÃ¼tzt"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim entfernen des Ablaufdatums"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "E-Mail wurde verschickt"
 
+#: 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 "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Gemeinschaft</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
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurÃ¼cksetzen"
@@ -458,87 +552,11 @@ msgstr "Datenbank-Host"
 msgid "Finish setup"
 msgstr "Installation abschlieÃŸen"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Montag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Freitag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Samstag"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "MÃ¤rz"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Dezember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -580,17 +598,3 @@ msgstr "Weiter"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sicherheitswarnung!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Bitte bestÃ¤tige Dein Passwort. <br/> Aus SicherheitsgrÃ¼nden wirst Du hierbei gebeten, Dein Passwort erneut einzugeben."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "BestÃ¤tigen"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index c68bff2ed63149a9ccc1e9cda3671272fc6e59c0..15ecd3bc9932578c9bcd9263f4c0868e0c777006 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -12,7 +12,7 @@
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 #   <lukas@statuscode.ch>, 2012.
 #   <mail@felixmoeller.de>, 2012.
-# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012-2013.
 #   <markus.thiel@desico.de>, 2013.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
@@ -27,9 +27,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 13:32+0000\n"
-"Last-Translator: thiel <markus.thiel@desico.de>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23: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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,46 +51,46 @@ msgstr "Konnte %s nicht verschieben"
 msgid "Unable to rename file"
 msgstr "Konnte Datei nicht umbenennen"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Datei fehlerfrei hochgeladen."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Die hochgeladene Datei Ã¼berschreitet die upload_max_filesize Vorgabe in php.ini"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die GrÃ¶ÃŸe der hochzuladenden Datei Ã¼berschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "TemporÃ¤rer Ordner fehlt."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr "Nicht genug Speicherplatz verfÃ¼gbar"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "UngÃ¼ltiges Verzeichnis"
 
@@ -98,11 +98,11 @@ msgstr "UngÃ¼ltiges Verzeichnis"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Nicht mehr freigeben"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "LÃ¶schen"
 
@@ -110,137 +110,151 @@ msgstr "LÃ¶schen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Name vorschlagen"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name} wurde ersetzt"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "rÃ¼ckgÃ¤ngig machen"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "Freigabe von {files} aufgehoben"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} gelÃ¶scht"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' ist kein gÃ¼ltiger Dateiname"
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Der Dateiname darf nicht leer sein"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "UngÃ¼ltiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulÃ¤ssig."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Ihr Speicherplatz ist voll, Dateien kÃ¶nnen nicht mehr aktualisiert oder synchronisiert werden!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Ihr Speicherplatz ist fast aufgebraucht ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Fehler beim Upload"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "SchlieÃŸen"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Eine Datei wird hoch geladen"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} Dateien werden hochgeladen"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein"
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} Dateien wurden gescannt"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Fehler beim Scannen"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} Dateien"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Hochladen"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Dateibehandlung"
@@ -289,36 +303,32 @@ msgstr "Ordner"
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Hochladen"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Upload zu groÃŸ"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Scanne"
diff --git a/l10n/de/files_encryption.po b/l10n/de/files_encryption.po
index 2231e6ffdf9cf19777de32735e0c38d5d5437fec..934dce6d1140e7cc5466f8d948bfd3c490e7f277 100644
--- a/l10n/de/files_encryption.po
+++ b/l10n/de/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <driz@i2pmail.org>, 2012.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 09:06+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:15+0000\n"
+"Last-Translator: Marcel KÃ¼hlhorn <susefan93@gmx.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +19,66 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Bitte wechseln Sie nun zum ownCloud Client und Ã¤ndern Sie ihr VerschlÃ¼sselungspasswort um die Konvertierung abzuschlieÃŸen."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "Zur Clientseitigen VerschlÃ¼sselung gewechselt"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Ã„ndern des VerschlÃ¼sselungspasswortes zum Anmeldepasswort"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Bitte Ã¼berprÃ¼fen sie Ihr Passwort und versuchen Sie es erneut."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Ihr VerschlÃ¼sselungspasswort konnte nicht als Anmeldepasswort gesetzt werden."
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "WÃ¤hlen Sie die VerschlÃ¼sselungsart:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Clientseitige VerschlÃ¼sselung (am sichersten, aber macht es unmÃ¶glich auf ihre Daten Ã¼ber das Webinterface zuzugreifen)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "Serverseitige VerschlÃ¼sselung (erlaubt es ihnen auf ihre Daten Ã¼ber das Webinterface und den Desktop-Client zuzugreifen)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Keine (ohne VerschlÃ¼sselung)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Wichtig: Sobald sie eine VerschlÃ¼sselungsmethode gewÃ¤hlt haben, kÃ¶nnen Sie diese nicht Ã¤ndern!"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "Benutzerspezifisch (der Benutzer kann entscheiden)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "VerschlÃ¼sselung"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Die folgenden Dateitypen von der VerschlÃ¼sselung ausnehmen"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Keine"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "VerschlÃ¼sselung aktivieren"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 464f1fe302c87bb8bbbbc2220b86ce606bf2c300..a3e251c142ca53964db0e58021fa6000f3cd90ee 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 09:08+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +22,10 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Alle Versionen lÃ¶schen"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historie"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versionen"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dies lÃ¶scht alle vorhandenen Sicherungsversionen Deiner Dateien."
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Dateiversionierung"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index d572145c29adfc54a3374b8602bcf3215b7d6efb..d27f2e0504b04502f77658dfaf70b9e29df1fbf2 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.po
@@ -6,7 +6,7 @@
 #   <blobbyjj@ymail.com>, 2012.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
-# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012-2013.
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 #   <transifex.3.mensaje@spamgourmet.com>, 2012.
@@ -14,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:13+0100\n"
-"PO-Revision-Date: 2012-12-11 09:31+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 03:39+0000\n"
+"Last-Translator: Marcel KÃ¼hlhorn <susefan93@gmx.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,51 +24,55 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "PersÃ¶nlich"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien mÃ¼ssen einzeln heruntergeladen werden."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ZurÃ¼ck zu \"Dateien\""
 
-#: files.php:386
+#: files.php:390
 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:229
+msgid "couldn't be determined"
+msgstr "Konnte nicht festgestellt werden"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Die Anwendung ist nicht aktiviert"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Authentifizierungs-Fehler"
 
@@ -88,55 +92,55 @@ msgstr "Text"
 msgid "Images"
 msgstr "Bilder"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "Vor einer Minute"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "Vor %d Minuten"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Vor %d Stunden"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Heute"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Gestern"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "Vor %d Tag(en)"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Vor %d Monaten"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Vor Jahren"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 1616f6a893ddcdde12a9378dc953643ae1927d7b..c26bb84c0915b221082f28644bbc94e5728a0ce4 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -20,12 +20,13 @@
 # Phi Lieb <>, 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -104,7 +105,7 @@ msgstr "Aktivieren"
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Deutsch (PersÃ¶nlich)"
 
@@ -116,15 +117,15 @@ msgstr "FÃ¼ge Deine Anwendung hinzu"
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "WÃ¤hle eine Anwendung aus"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen findest Du auf apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
@@ -159,7 +160,7 @@ msgstr "Du verwendest <strong>%s</strong> der verfÃ¼gbaren <strong>%s<strong>"
 
 #: templates/personal.php:12
 msgid "Clients"
-msgstr "Kunden"
+msgstr "Clients"
 
 #: templates/personal.php:13
 msgid "Download Desktop Clients"
@@ -173,7 +174,7 @@ msgstr "Android-Client herunterladen"
 msgid "Download iOS Client"
 msgstr "iOS-Client herunterladen"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passwort"
 
@@ -243,11 +244,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Name"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -259,26 +260,30 @@ msgstr "Anlegen"
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standard"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "LÃ¶schen"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 7e83a5b2043bdbfbf8f45b58ec0e11af9bd80eb4..95aabcd2e67b5e3bc9416f20b98f74858015f48d 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.po
@@ -6,6 +6,7 @@
 #   <blobbyjj@ymail.com>, 2012.
 # I Robot <owncloud-bot@tmit.eu>, 2012.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013.
 # Maurice PreuÃŸ <>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
@@ -15,9 +16,9 @@ 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 14:04+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:08+0000\n"
+"Last-Translator: Marcel KÃ¼hlhorn <susefan93@gmx.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,9 +35,9 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Warnung:</b> Das PHP-Modul, das LDAP benÃ¶ntigt, ist nicht installiert. Das Backend wird nicht funktionieren. Bitte deinen 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."
+msgstr "<b>Warnung:</b> Da das PHP-Modul fÃ¼r LDAP ist nicht installiert, das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -51,6 +52,10 @@ msgstr "Du kannst das Protokoll auslassen, auÃŸer wenn Du SSL benÃ¶tigst. Beginn
 msgid "Base DN"
 msgstr "Basis-DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Ein Base DN pro Zeile"
+
 #: templates/settings.php:16
 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"
@@ -122,10 +127,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Ein Benutzer Base DN pro Zeile"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Ein Gruppen Base DN pro Zeile"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
diff --git a/l10n/de/user_webdavauth.po b/l10n/de/user_webdavauth.po
index 392938e5f9278be67376040045fa3331d61be323..3bc6180a309a29f1d25279403adaaa6fa5ea83fa 100644
--- a/l10n/de/user_webdavauth.po
+++ b/l10n/de/user_webdavauth.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 #   <blobbyjj@ymail.com>, 2012.
+#   <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: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 14:08+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,17 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Authentifikation"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud wird die Logindaten zu dieser URL senden. http 401 und http 403 werden als falsche Logindaten interpretiert und alle anderen Codes als korrekte Logindaten."
+"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."
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index 9fea01800686cc18b8540b170176ba2289ab9e8a..0d1dcf34486aa046fab283fa40097f7ef4604fbf 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -9,10 +9,11 @@
 #   <blobbyjj@ymail.com>, 2012.
 #   <deh3nne@deviantdev.com>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011.
+# I Robot <owncloud-bot@tmit.eu>, 2013.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <mail@felixmoeller.de>, 2012.
-# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012-2013.
 #   <m.fresel@sysangels.com>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
@@ -23,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+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"
 "MIME-Version: 1.0\n"
@@ -33,24 +34,24 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: 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"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s hat ein Verzeichnis fÃ¼r Sie freigegeben"
 
-#: ajax/share.php:88
+#: 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"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -95,59 +96,135 @@ msgstr "Es wurden keine Kategorien zum LÃ¶schen ausgewÃ¤hlt."
 msgid "Error removing %s from favorites."
 msgstr "Fehler beim Entfernen von %s von den Favoriten."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Montag"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Freitag"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Samstag"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "MÃ¤rz"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Dezember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "Vor 1 Minute"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "Vor {minutes} Minuten"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "Vor {hours} Stunden"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Heute"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Gestern"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "Vor {days} Tag(en)"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "Vor {months} Monaten"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Vor Monaten"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Vor Jahren"
 
@@ -177,8 +254,8 @@ msgid "The object type is not specified."
 msgstr "Der Objekttyp ist nicht angegeben."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Fehler"
 
@@ -190,123 +267,141 @@ msgstr "Der App-Name ist nicht angegeben."
 msgid "The required file {file} is not installed!"
 msgstr "Die benÃ¶tigte Datei {file} ist nicht installiert."
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Fehler bei der Freigabe"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Fehler bei der Aufhebung der Freigabe"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Fehler bei der Ã„nderung der Rechte"
 
-#: js/share.js:151
+#: 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."
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Durch {owner} fÃ¼r Sie freigegeben."
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Freigeben fÃ¼r"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Ãœber einen Link freigeben"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Passwort"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Link per E-Mail verschicken"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Senden"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail freigeben:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "lÃ¶schen"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "freigeben"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Durch ein Passwort geschÃ¼tzt"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Sende ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Email gesendet"
 
+#: 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 "Das Update ist fehlgeschlagen. Bitte melden Sie dieses Problem an die <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud Gemeinschaft</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
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurÃ¼cksetzen"
@@ -458,87 +553,11 @@ msgstr "Datenbank-Host"
 msgid "Finish setup"
 msgstr "Installation abschlieÃŸen"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Montag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Freitag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Samstag"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "MÃ¤rz"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Dezember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Abmelden"
 
@@ -580,17 +599,3 @@ msgstr "Weiter"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Aktualisiere ownCloud auf Version %s. Dies kÃ¶nnte eine Weile dauern."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sicherheitshinweis!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Bitte Ã¼berprÃ¼fen Sie Ihr Passwort. <br/>Aus SicherheitsgrÃ¼nden werden Sie gelegentlich aufgefordert, Ihr Passwort erneut einzugeben."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ÃœberprÃ¼fen"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index ca3e44187b13c12ed1f281ae2fefb8db2520a544..d81df74a94ab5ef55a1296ea6c3134e38b8003b0 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2012.
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
 #   <a.tangemann@web.de>, 2012-2013.
 #   <blobbyjj@ymail.com>, 2012.
 # I Robot <owncloud-bot@tmit.eu>, 2012-2013.
@@ -13,7 +14,7 @@
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 #   <lukas@statuscode.ch>, 2012.
 #   <mail@felixmoeller.de>, 2012.
-# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2012-2013.
 #   <markus.thiel@desico.de>, 2013.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
@@ -27,9 +28,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 13:29+0000\n"
-"Last-Translator: thiel <markus.thiel@desico.de>\n"
+"POT-Creation-Date: 2013-01-29 00:04+0100\n"
+"PO-Revision-Date: 2013-01-28 21:38+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,46 +52,46 @@ msgstr "Konnte %s nicht verschieben"
 msgid "Unable to rename file"
 msgstr "Konnte Datei nicht umbenennen"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Keine Datei hochgeladen. Unbekannter Fehler"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Die hochgeladene Datei Ã¼berschreitet die upload_max_filesize Vorgabe in php.ini"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Die GrÃ¶ÃŸe der hochzuladenden Datei Ã¼berschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Die Datei wurde nur teilweise hochgeladen."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Es wurde keine Datei hochgeladen."
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Der temporÃ¤re Ordner fehlt."
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Fehler beim Schreiben auf die Festplatte"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Nicht genÃ¼gend Speicherplatz verfÃ¼gbar"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Nicht genug Speicher vorhanden."
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "UngÃ¼ltiges Verzeichnis."
 
@@ -98,11 +99,11 @@ msgstr "UngÃ¼ltiges Verzeichnis."
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Nicht mehr freigeben"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "LÃ¶schen"
 
@@ -110,137 +111,151 @@ msgstr "LÃ¶schen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Name vorschlagen"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name} wurde ersetzt"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "rÃ¼ckgÃ¤ngig machen"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "Freigabe fÃ¼r {files} beendet"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} gelÃ¶scht"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' ist kein gÃ¼ltiger Dateiname."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Der Dateiname darf nicht leer sein."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "UngÃ¼ltiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulÃ¤ssig."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Ihr Speicher ist voll. Daher kÃ¶nnen keine Dateien mehr aktualisiert oder synchronisiert werden!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Ihr Speicher ist fast voll ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Fehler beim Upload"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "SchlieÃŸen"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} Dateien wurden hochgeladen"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Die URL darf nicht leer sein."
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} Dateien wurden gescannt"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Fehler beim Scannen"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "GrÃ¶ÃŸe"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} Dateien"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Hochladen"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Dateibehandlung"
@@ -289,36 +304,32 @@ msgstr "Ordner"
 msgid "From link"
 msgstr "Von einem Link"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Hochladen"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Bitte laden Sie etwas hoch!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Der Upload ist zu groÃŸ"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Scanne"
diff --git a/l10n/de_DE/files_encryption.po b/l10n/de_DE/files_encryption.po
index 52f9f34a774f3f51394df8784f37bbf4ee1e6916..7521754abfd6dd0622931f2d148828baa8a49f58 100644
--- a/l10n/de_DE/files_encryption.po
+++ b/l10n/de_DE/files_encryption.po
@@ -3,14 +3,18 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <admin@kaio.ws>, 2013.
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
 #   <driz@i2pmail.org>, 2012.
+# Marc-Andre Husyk <member@wue.de>, 2013.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:33+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:14+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +22,66 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Bitte wechseln Sie nun zum ownCloud Client und Ã¤ndern Sie ihr VerschlÃ¼sselungspasswort um die Konvertierung abzuschlieÃŸen."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "Zur Clientseitigen VerschlÃ¼sselung gewechselt"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Ã„ndern des VerschlÃ¼sselungspasswortes zum Anmeldepasswort"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Bitte Ã¼berprÃ¼fen sie Ihr Passwort und versuchen Sie es erneut."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Ihr VerschlÃ¼sselungspasswort konnte nicht als Anmeldepasswort gesetzt werden."
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "WÃ¤hlen Sie die VerschlÃ¼sselungsmethode:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Clientseitige VerschlÃ¼sselung (am sichersten, aber macht es unmÃ¶glich auf ihre Daten Ã¼ber das Webinterface zuzugreifen)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "Serverseitige VerschlÃ¼sselung (erlaubt es ihnen auf ihre Daten Ã¼ber das Webinterface und den Desktop-Client zuzugreifen)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Keine (ohne VerschlÃ¼sselung)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Wichtig: Sobald sie eine VerschlÃ¼sselungsmethode gewÃ¤hlt haben, kÃ¶nnen Sie diese nicht Ã¤ndern!"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "Benutzerspezifisch (der Benutzer kann entscheiden)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "VerschlÃ¼sselung"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Die folgenden Dateitypen von der VerschlÃ¼sselung ausnehmen"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Keine"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "VerschlÃ¼sselung aktivieren"
diff --git a/l10n/de_DE/files_versions.po b/l10n/de_DE/files_versions.po
index c9f8e08c2e549df2c932b95170b219b3d9c9a55a..bef0ee6b762dd1a12306d53b8a568eb029144a36 100644
--- a/l10n/de_DE/files_versions.po
+++ b/l10n/de_DE/files_versions.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:36+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\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"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +22,10 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Alle Versionen lÃ¶schen"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historie"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versionen"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dies lÃ¶scht alle vorhandenen Sicherungsversionen Ihrer Dateien."
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Dateiversionierung"
diff --git a/l10n/de_DE/lib.po b/l10n/de_DE/lib.po
index 3c9177f17ed7cfc37151da258d2c3c878a6488a4..851e152e2d5e56c7d3e9140b109e949c1216e414 100644
--- a/l10n/de_DE/lib.po
+++ b/l10n/de_DE/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
 #   <a.tangemann@web.de>, 2012.
 #   <blobbyjj@ymail.com>, 2012.
 # Jan-Christoph Borchardt <hey@jancborchardt.net>, 2012.
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-11 00:04+0100\n"
-"PO-Revision-Date: 2012-12-10 13:49+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:16+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,51 +25,55 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "Hilfe"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "PersÃ¶nlich"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Benutzer"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien mÃ¼ssen einzeln heruntergeladen werden."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ZurÃ¼ck zu \"Dateien\""
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewÃ¤hlten Dateien sind zu groÃŸ, um eine ZIP-Datei zu erstellen."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "konnte nicht ermittelt werden"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Die Anwendung ist nicht aktiviert"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Authentifizierungs-Fehler"
 
@@ -88,55 +93,55 @@ msgstr "Text"
 msgid "Images"
 msgstr "Bilder"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Gerade eben"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "Vor einer Minute"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "Vor %d Minuten"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Vor einer Stunde"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Vor %d Stunden"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Heute"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Gestern"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "Vor %d Tag(en)"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Letzten Monat"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Vor %d Monaten"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Letztes Jahr"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Vor  Jahren"
 
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 98a84230b5c018ca7c918520383d89f575e0bf6c..0c99f265629f090976bad5601769d8ff6d4af20f 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -20,12 +20,13 @@
 #   <thomas.mueller@tmit.eu>, 2012.
 #   <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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+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"
 "MIME-Version: 1.0\n"
@@ -104,7 +105,7 @@ msgstr "Aktivieren"
 msgid "Saving..."
 msgstr "Speichern..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Deutsch (FÃ¶rmlich: Sie)"
 
@@ -116,15 +117,15 @@ msgstr "FÃ¼gen Sie Ihre Anwendung hinzu"
 msgid "More Apps"
 msgstr "Weitere Anwendungen"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "WÃ¤hlen Sie eine Anwendung aus"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
@@ -159,7 +160,7 @@ msgstr "Sie verwenden <strong>%s</strong> der verfÃ¼gbaren <strong>%s</strong>"
 
 #: templates/personal.php:12
 msgid "Clients"
-msgstr "Kunden"
+msgstr "Clients"
 
 #: templates/personal.php:13
 msgid "Download Desktop Clients"
@@ -173,7 +174,7 @@ msgstr "Android-Client herunterladen"
 msgid "Download iOS Client"
 msgstr "iOS-Client herunterladen"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passwort"
 
@@ -243,11 +244,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Name"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -259,26 +260,30 @@ msgstr "Anlegen"
 msgid "Default Storage"
 msgstr "Standard-Speicher"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppenadministrator"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Speicher"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Standard"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "LÃ¶schen"
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 843b2e80f4d81debc538c5f94c2cd0913548163f..e1d07152a629bab1046c7824c689d709788b943d 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.po
@@ -3,8 +3,10 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Andreas Tangemann <a.tangemann@web.de>, 2013.
 #   <blobbyjj@ymail.com>, 2012.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
+# Marcel KÃ¼hlhorn <susefan93@gmx.de>, 2013.
 # Maurice PreuÃŸ <>, 2012.
 #   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
@@ -14,9 +16,9 @@ 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 14:04+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:08+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,9 +35,9 @@ msgstr "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkom
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Warnung:</b> Das PHP-Modul, das LDAP benÃ¶ntigt, ist nicht installiert. Das Backend wird 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."
+msgstr "<b>Warnung:</b> Da das PHP-Modul fÃ¼r LDAP ist nicht installiert, das Backend wird nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -50,6 +52,10 @@ msgstr "Sie kÃ¶nnen das Protokoll auslassen, auÃŸer wenn Sie SSL benÃ¶tigen. Beg
 msgid "Base DN"
 msgstr "Basis-DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Ein Base DN pro Zeile"
+
 #: templates/settings.php:16
 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"
@@ -121,10 +127,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Ein Benutzer Base DN pro Zeile"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Ein Gruppen Base DN pro Zeile"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
diff --git a/l10n/de_DE/user_webdavauth.po b/l10n/de_DE/user_webdavauth.po
index aabd937409d7ada24438d4227b6b2d336801a9e9..2d01d1e91e15c6ebeb00418eb1bbdc399297f748 100644
--- a/l10n/de_DE/user_webdavauth.po
+++ b/l10n/de_DE/user_webdavauth.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <a.tangemann@web.de>, 2012.
+#   <a.tangemann@web.de>, 2012-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-04 13:22+0100\n"
-"PO-Revision-Date: 2013-01-03 16:07+0000\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"
 "MIME-Version: 1.0\n"
@@ -20,13 +20,17 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Authentifizierung"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud "
+"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."
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 2c0853779a16e5ec8653676acd89cc95b61d25d6..6ad17c2deb6ba662deda53763665bf648e108224 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -10,12 +10,13 @@
 # Marios Bekatoros <>, 2012.
 #   <petros.kyladitis@gmail.com>, 2011.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -24,24 +25,24 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ %s Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î¿ Î¼Îµ ÎµÏƒÎ¬Ï‚"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÎŸ Ï‡ÏÎ®ÏƒÏ„Î·Ï‚ %s Î´Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ ÎÎ½Î± Ï†Î¬ÎºÎµÎ»Î¿ Î¼Îµ ÎµÏƒÎ¬Ï‚"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -86,59 +87,135 @@ msgstr "Î”ÎµÎ½ ÎµÏ€Î¹Î»ÎÏ‡Ï„Î·ÎºÎ±Î½ ÎºÎ±Ï„Î·Î³Î¿ÏÎ¯ÎµÏ‚ Î³Î¹Î± Î´Î¹Î±Î³ÏÎ±Ï†
 msgid "Error removing %s from favorites."
 msgstr "Î£Ï†Î¬Î»Î¼Î± Î±Ï†Î±Î¯ÏÎµÏƒÎ·Ï‚ %s Î±Ï€ÏŒ Ï„Î± Î±Î³Î±Ï€Î·Î¼ÎÎ½Î±."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "ÎšÏ…ÏÎ¹Î±ÎºÎ®"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Î”ÎµÏ…Ï„ÎÏÎ±"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Î¤ÏÎ¯Ï„Î·"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Î¤ÎµÏ„Î¬ÏÏ„Î·"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Î ÎÎ¼Ï€Ï„Î·"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Î Î±ÏÎ±ÏƒÎºÎµÏ…Î®"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Î£Î¬Î²Î²Î±Ï„Î¿"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Î™Î±Î½Î¿Ï…Î¬ÏÎ¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Î¦ÎµÎ²ÏÎ¿Ï…Î¬ÏÎ¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ÎœÎ¬ÏÏ„Î¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Î‘Ï€ÏÎ¯Î»Î¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "May"
+msgstr "ÎœÎ¬ÏŠÎ¿Ï‚"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Î™Î¿ÏÎ½Î¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Î™Î¿ÏÎ»Î¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Î‘ÏÎ³Î¿Ï…ÏƒÏ„Î¿Ï‚"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Î£ÎµÏ€Ï„ÎÎ¼Î²ÏÎ¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "October"
+msgstr "ÎŸÎºÏ„ÏŽÎ²ÏÎ¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "November"
+msgstr "ÎÎ¿ÎÎ¼Î²ÏÎ¹Î¿Ï‚"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Î”ÎµÎºÎÎ¼Î²ÏÎ¹Î¿Ï‚"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 Î»ÎµÏ€Ï„ÏŒ Ï€ÏÎ¹Î½"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} Î»ÎµÏ€Ï„Î¬ Ï€ÏÎ¹Î½"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 ÏŽÏÎ± Ï€ÏÎ¹Î½"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} ÏŽÏÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ÏƒÎ®Î¼ÎµÏÎ±"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ï‡Ï„ÎµÏ‚"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} Î·Î¼ÎÏÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Î¼Î®Î½Î±"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ï„ÎµÎ»ÎµÏ…Ï„Î±Î¯Î¿ Ï‡ÏÏŒÎ½Î¿"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ï‡ÏÏŒÎ½Î¹Î± Ï€ÏÎ¹Î½"
 
@@ -168,8 +245,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î±"
 
@@ -181,123 +258,141 @@ msgstr "Î”ÎµÎ½ ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÏ„Î·ÎºÎµ Ï„Î¿ ÏŒÎ½Î¿Î¼Î± Ï„Î·Ï‚ ÎµÏ†Î±ÏÎ¼Î¿Î³Î®Ï‚.
 msgid "The required file {file} is not installed!"
 msgstr "Î¤Î¿ Î±Ï€Î±Î¹Ï„Î¿ÏÎ¼ÎµÎ½Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ {file} Î´ÎµÎ½ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿Î½ Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒ"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿ ÏƒÏ„Î±Î¼Î¬Ï„Î·Î¼Î± Ï„Î¿Ï… Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î±Î»Î»Î±Î³Î® Ï„Ï‰Î½ Î´Î¹ÎºÎ±Î¹Ï‰Î¼Î¬Ï„Ï‰Î½"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Î¼Îµ ÏƒÎ±Ï‚ ÎºÎ±Î¹ Î¼Îµ Ï„Î·Î½ Î¿Î¼Î¬Î´Î± {group} Ï„Î¿Ï… {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ¬ÏƒÏ„Î·ÎºÎµ Î¼Îµ ÏƒÎ±Ï‚ Î±Ï€ÏŒ Ï„Î¿Î½ {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼Îµ"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼Îµ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î® ÏƒÏ…Î½Î´ÎÏƒÎ¼Î¿Ï… Î¼Îµ email "
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "ÎŸÏÎ¹ÏƒÎ¼ÏŒÏ‚ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Î—Î¼ÎµÏÎ¿Î¼Î·Î½Î¯Î± Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î¼ÎÏƒÏ‰ email:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Î”ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ Î¬Î½Î¸ÏÏ‰Ï€Î¿Ï‚"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ÎžÎ±Î½Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€ÎµÏ„Î±Î¹"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Î”Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚ Ï„Î¿Ï… {item} Î¼Îµ Ï„Î¿Î½ {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Î£Ï„Î±Î¼Î¬Ï„Î·Î¼Î± Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼Î¿Ï"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "Î´Ï…Î½Î±Ï„ÏŒÏ„Î·Ï„Î± Î±Î»Î»Î±Î³Î®Ï‚"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ÎÎ»ÎµÎ³Ï‡Î¿Ï‚ Ï€ÏÏŒÏƒÎ²Î±ÏƒÎ·Ï‚"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "ÎµÎ½Î·Î¼ÎÏÏ‰ÏƒÎ·"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "Î´Î¹Î±Î³ÏÎ±Ï†Î®"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÏŒÏ‚"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Î ÏÎ¿ÏƒÏ„Î±ÏƒÎ¯Î± Î¼Îµ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î´Î¹Î±Î³ÏÎ±Ï†Î® Ï„Î·Ï‚ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Î£Ï†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î¿Î½ Î¿ÏÎ¹ÏƒÎ¼ÏŒ Î·Î¼. Î»Î®Î¾Î·Ï‚"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Î¤Î¿ Email Î±Ï€ÎµÏƒÏ„Î¬Î»Î· "
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "Î•Ï€Î±Î½Î±Ï†Î¿ÏÎ¬ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ownCloud"
@@ -449,87 +544,11 @@ msgstr "Î”Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®Ï‚ Î²Î¬ÏƒÎ·Ï‚ Î´ÎµÎ´Î¿Î¼ÎÎ½Ï‰Î½"
 msgid "Finish setup"
 msgstr "ÎŸÎ»Î¿ÎºÎ»Î®ÏÏ‰ÏƒÎ· ÎµÎ³ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "ÎšÏ…ÏÎ¹Î±ÎºÎ®"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Î”ÎµÏ…Ï„ÎÏÎ±"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Î¤ÏÎ¯Ï„Î·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Î¤ÎµÏ„Î¬ÏÏ„Î·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Î ÎÎ¼Ï€Ï„Î·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Î Î±ÏÎ±ÏƒÎºÎµÏ…Î®"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Î£Î¬Î²Î²Î±Ï„Î¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Î™Î±Î½Î¿Ï…Î¬ÏÎ¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Î¦ÎµÎ²ÏÎ¿Ï…Î¬ÏÎ¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ÎœÎ¬ÏÏ„Î¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Î‘Ï€ÏÎ¯Î»Î¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "ÎœÎ¬ÏŠÎ¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Î™Î¿ÏÎ½Î¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Î™Î¿ÏÎ»Î¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Î‘ÏÎ³Î¿Ï…ÏƒÏ„Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Î£ÎµÏ€Ï„ÎÎ¼Î²ÏÎ¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "ÎŸÎºÏ„ÏŽÎ²ÏÎ¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "ÎÎ¿ÎÎ¼Î²ÏÎ¹Î¿Ï‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Î”ÎµÎºÎÎ¼Î²ÏÎ¹Î¿Ï‚"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Î¥Ï€Î·ÏÎµÏƒÎ¯ÎµÏ‚ web Ï…Ï€ÏŒ Ï„Î¿Î½ ÎÎ»ÎµÎ³Ï‡ÏŒ ÏƒÎ±Ï‚"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Î‘Ï€Î¿ÏƒÏÎ½Î´ÎµÏƒÎ·"
 
@@ -570,18 +589,4 @@ msgstr "ÎµÏ€ÏŒÎ¼ÎµÎ½Î¿"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Î ÏÎ¿ÎµÎ¹Î´Î¿Ï€Î¿Î¯Î·ÏƒÎ· Î‘ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÏ€Î¹Î²ÎµÎ²Î±Î¹ÏŽÏƒÏ„Îµ Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÎ±Ï‚. <br/>Î“Î¹Î± Î»ÏŒÎ³Î¿Ï…Ï‚ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± ÎµÏÏ‰Ï„Î¬ÏƒÏ„Îµ Î½Î± ÎµÎ¹ÏƒÎ¬Î³ÎµÏ„Îµ Î¾Î±Î½Î¬ Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÎ±Ï‚."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Î•Ï€Î±Î»Î®Î¸ÎµÏ…ÏƒÎ·"
+msgstr "Î•Î½Î·Î¼ÎµÏÏŽÎ½Î¿Î½Ï„Î±Ï‚ Ï„Î¿ ownCloud ÏƒÏ„Î·Î½ ÎÎºÎ´Î¿ÏƒÎ· %s,Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€Î¬ÏÎµÎ¹ Î»Î¯Î³Î¿ Ï‡ÏÏŒÎ½Î¿."
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 6dbee32887acd555c3bc845dd15b1e7db2ab4376..d756e7d0b9e19f2a6253b4298f09ab5f48c3f32b 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -4,7 +4,8 @@
 # 
 # Translators:
 # Dimitris M. <monopatis@gmail.com>, 2012.
-# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012-2013.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
 # Efstathios Iosifidis <iosifidis@opensuse.org>, 2012.
 # Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
 # Marios Bekatoros <>, 2012.
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-29 00:04+0100\n"
+"PO-Revision-Date: 2013-01-28 02:25+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"
@@ -27,69 +28,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î¼ÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Ï„Î¿Ï… %s - Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î· Î±ÏÏ‡ÎµÎ¯Î¿ Î¼Îµ Î±Ï…Ï„ÏŒ Ï„Î¿ ÏŒÎ½Î¿Î¼Î±"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î¼ÎµÏ„Î±ÎºÎ¯Î½Î·ÏƒÎ·Ï‚ Ï„Î¿Ï… %s"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î¼ÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±Ï‚ Î±ÏÏ‡ÎµÎ¯Î¿Ï…"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Î”ÎµÎ½ Î±Î½ÎÎ²Î·ÎºÎµ ÎºÎ¬Ï€Î¿Î¹Î¿ Î±ÏÏ‡ÎµÎ¯Î¿. Î†Î³Î½Ï‰ÏƒÏ„Î¿ ÏƒÏ†Î¬Î»Î¼Î±"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ ÏƒÏ†Î¬Î»Î¼Î±, Ï„Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ ÎµÏƒÏ„Î¬Î»ÎµÎ¹ ÎµÏ€Î¹Ï„Ï…Ï‡ÏŽÏ‚"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Î¤Î¿ Î±Ï€ÎµÏƒÏ„Î±Î»Î¼ÎÎ½Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Î¾ÎµÏ€ÎµÏÎ½Î¬ Ï„Î·Î½ Î¿Î´Î·Î³Î¯Î± upload_max_filesize ÏƒÏ„Î¿ php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Ï…Ï€ÎµÏÎ²Î±Î¯Î½ÎµÎ¹ Ï„Î·Î½ Î¿Î´Î·Î³Î¯Î± Î¼ÎÎ³Î¹ÏƒÏ„Î¿Ï… ÎµÏ€Î¹Ï„ÏÎµÏ€Ï„Î¿Ï Î¼ÎµÎ³ÎÎ¸Î¿Ï…Ï‚ \"MAX_FILE_SIZE\" Ï€Î¿Ï… ÎÏ‡ÎµÎ¹ Î¿ÏÎ¹ÏƒÏ„ÎµÎ¯ ÏƒÏ„Î·Î½ HTML Ï†ÏŒÏÎ¼Î±"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Î¤Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ ÎµÏƒÏ„Î¬Î»ÎµÎ¹ Î¼ÏŒÎ½Î¿ ÎµÎ½ Î¼ÎÏÎµÎ¹"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "ÎšÎ±Î½ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î¿ Î´ÎµÎ½ ÏƒÏ„Î¬Î»Î¸Î·ÎºÎµ"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Î›ÎµÎ¯Ï€ÎµÎ¹ Î¿ Ï€ÏÎ¿ÏƒÏ‰ÏÎ¹Î½ÏŒÏ‚ Ï†Î¬ÎºÎµÎ»Î¿Ï‚"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Î‘Ï€Î¿Ï„Ï…Ï‡Î¯Î± ÎµÎ³Î³ÏÎ±Ï†Î®Ï‚ ÏƒÏ„Î¿ Î´Î¯ÏƒÎºÎ¿"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr ""
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "ÎœÎ· ÎµÏ€Î±ÏÎºÎ®Ï‚ Î´Î¹Î±Î¸ÎÏƒÎ¹Î¼Î¿Ï‚ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ Ï‡ÏŽÏÎ¿Ï‚"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿Ï‚ Ï†Î¬ÎºÎµÎ»Î¿Ï‚."
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "Î‘ÏÏ‡ÎµÎ¯Î±"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Î”Î¹Î±ÎºÎ¿Ï€Î® ÎºÎ¿Î¹Î½Î®Ï‚ Ï‡ÏÎ®ÏƒÎ·Ï‚"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
 
@@ -97,137 +98,151 @@ msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
 msgid "Rename"
 msgstr "ÎœÎµÏ„Î¿Î½Î¿Î¼Î±ÏƒÎ¯Î±"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Î®Î´Î·"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Î±Î½Ï„Î¹ÎºÎ±Ï„ÎÏƒÏ„Î·ÏƒÎµ"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "ÏƒÏ…Î½Î¹ÏƒÏ„ÏŽÎ¼ÎµÎ½Î¿ ÏŒÎ½Î¿Î¼Î±"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Î±ÎºÏÏÏ‰ÏƒÎ·"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name} Î±Î½Ï„Î¹ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Î±Î½Î±Î¯ÏÎµÏƒÎ·"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "Î±Î½Ï„Î¹ÎºÎ±Ï„Î±ÏƒÏ„Î¬Î¸Î·ÎºÎµ Ï„Î¿ {new_name} Î¼Îµ {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "Î¼Î· Î´Î¹Î±Î¼Î¿Î¹ÏÎ±ÏƒÎ¼ÎÎ½Î± {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "Î´Î¹Î±Î³ÏÎ±Î¼Î¼ÎÎ½Î± {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' ÎµÎ¯Î½Î±Î¹ Î¼Î· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï…."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Î¤Î¿ ÏŒÎ½Î¿Î¼Î± Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î´ÎµÎ½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½ÏŒ."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î±, '\\', '/', '<', '>', ':', '\"', '|', '?' ÎºÎ±Î¹ '*' Î´ÎµÎ½ ÎµÏ€Î¹Ï„ÏÎÏ€Î¿Î½Ï„Î±Î¹."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Ï€Î±ÏÎ±Î³Ï‰Î³Î® Î±ÏÏ‡ÎµÎ¯Î¿Ï… ZIP, Î¯ÏƒÏ‰Ï‚ Î´Î¹Î±ÏÎºÎÏƒÎµÎ¹ Î±ÏÎºÎµÏ„Î¬."
+#: 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 "ÎŸ Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÏŒÏ‚ Ï‡ÏŽÏÎ¿Ï‚ ÎµÎ¯Î½Î±Î¹ ÏƒÏ‡ÎµÎ´ÏŒÎ½ Î³ÎµÎ¼Î¬Ï„Î¿Ï‚ ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Î— Î»Î®ÏˆÎ· Ï€ÏÎ¿ÎµÏ„Î¿Î¹Î¼Î¬Î¶ÎµÏ„Î±Î¹. Î‘Ï…Ï„ÏŒ Î¼Ï€Î¿ÏÎµÎ¯ Î½Î± Ï€Î¬ÏÎµÎ¹ ÏŽÏÎ± ÎµÎ¬Î½ Ï„Î± Î±ÏÏ‡ÎµÎ¯Î± ÎÏ‡Î¿Ï…Î½ Î¼ÎµÎ³Î¬Î»Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚."
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± ÏƒÏ„Î·Î½ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… ÏƒÎ±Ï‚ Î±Ï†Î¿Ï ÎµÎ¯Î½Î±Î¹ Ï†Î¬ÎºÎµÎ»Î¿Ï‚ Î® ÎÏ‡ÎµÎ¹ 0 bytes"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "ÎšÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Î•ÎºÎºÏÎµÎ¼ÎµÎ¯"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 Î±ÏÏ‡ÎµÎ¯Î¿ Î±Î½ÎµÎ²Î±Î¯Î½ÎµÎ¹"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} Î±ÏÏ‡ÎµÎ¯Î± Î±Î½ÎµÎ²Î±Î¯Î½Î¿Ï…Î½"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Î— Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Î±ÎºÏ…ÏÏŽÎ¸Î·ÎºÎµ."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Î— Î±Ï€Î¿ÏƒÏ„Î¿Î»Î® Ï„Î¿Ï… Î±ÏÏ‡ÎµÎ¯Î¿Ï… Î²ÏÎ¯ÏƒÎºÎµÏ„Î±Î¹ ÏƒÎµ ÎµÎ¾ÎÎ»Î¹Î¾Î·. Î¤Î¿ ÎºÎ»ÎµÎ¯ÏƒÎ¹Î¼Î¿ Ï„Î·Ï‚ ÏƒÎµÎ»Î¯Î´Î±Ï‚ Î¸Î± Î±ÎºÏ…ÏÏŽÏƒÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Î— URL Î´ÎµÎ½ Ï€ÏÎÏ€ÎµÎ¹ Î½Î± ÎµÎ¯Î½Î±Î¹ ÎºÎµÎ½Î®."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "ÎœÎ· ÎÎ³ÎºÏ…ÏÎ¿ ÏŒÎ½Î¿Î¼Î± Ï†Î±ÎºÎÎ»Î¿Ï…. Î— Ï‡ÏÎ®ÏƒÎ· Ï„Î¿Ï… 'ÎšÎ¿Î¹Î½ÏŒÏ‡ÏÎ·ÏƒÏ„Î¿Ï‚' Ï‡ÏÎ·ÏƒÎ¹Î¼Î¿Ï€Î¿Î¹ÎµÎ¯Ï„Î±Î¹ Î±Ï€ÏŒ Î¿ Owncloud"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} Î±ÏÏ‡ÎµÎ¯Î± Î±Î½Î¹Ï‡Î½ÎµÏÏ„Î·ÎºÎ±Î½"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "ÏƒÏ†Î¬Î»Î¼Î± ÎºÎ±Ï„Î¬ Ï„Î·Î½ Î±Î½Î¯Ï‡Î½ÎµÏ…ÏƒÎ·"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "ÎŒÎ½Î¿Î¼Î±"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "ÎœÎÎ³ÎµÎ¸Î¿Ï‚"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Î¤ÏÎ¿Ï€Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 Ï†Î¬ÎºÎµÎ»Î¿Ï‚"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} Ï†Î¬ÎºÎµÎ»Î¿Î¹"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 Î±ÏÏ‡ÎµÎ¯Î¿"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} Î±ÏÏ‡ÎµÎ¯Î±"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¯ÏÎ¹ÏƒÎ· Î±ÏÏ‡ÎµÎ¯Ï‰Î½"
@@ -276,36 +291,32 @@ msgstr "Î¦Î¬ÎºÎµÎ»Î¿Ï‚"
 msgid "From link"
 msgstr "Î‘Ï€ÏŒ ÏƒÏÎ½Î´ÎµÏƒÎ¼Î¿"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Î‘Ï€Î¿ÏƒÏ„Î¿Î»Î®"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Î‘ÎºÏÏÏ‰ÏƒÎ· Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Î”ÎµÎ½ Ï…Ï€Î¬ÏÏ‡ÎµÎ¹ Ï„Î¯Ï€Î¿Ï„Î± ÎµÎ´ÏŽ. Î‘Î½ÎÎ²Î±ÏƒÎµ ÎºÎ¬Ï„Î¹!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Î›Î®ÏˆÎ·"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Î Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î¿ Î±ÏÏ‡ÎµÎ¯Î¿ Ï€ÏÎ¿Ï‚ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€Î¿Ï… Ï€ÏÎ¿ÏƒÏ€Î±Î¸ÎµÎ¯Ï„Îµ Î½Î± Î±Î½ÎµÎ²Î¬ÏƒÎµÏ„Îµ Ï…Ï€ÎµÏÎ²Î±Î¯Î½Î¿Ï…Î½ Ï„Î¿ Î¼ÎÎ³Î¹ÏƒÏ„Î¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï‚ Î±Ï€Î¿ÏƒÏ„Î¿Î»Î®Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎµ Î±Ï…Ï„ÏŒÎ½ Ï„Î¿Î½ Î´Î¹Î±ÎºÎ¿Î¼Î¹ÏƒÏ„Î®."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± ÏƒÎ±ÏÏŽÎ½Î¿Î½Ï„Î±Î¹, Ï€Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï€ÎµÏÎ¹Î¼ÎÎ½ÎµÏ„Îµ"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Î¤ÏÎÏ‡Î¿Ï…ÏƒÎ± Î±Î½Î±Î¶Î®Ï„Î·ÏƒÎ· "
diff --git a/l10n/el/files_encryption.po b/l10n/el/files_encryption.po
index 6d54cf8abcf774536ad2185c25d18383f0720d4e..8733b3c0019b26c6ca8f3d850c15411dd6a04f8c 100644
--- a/l10n/el/files_encryption.po
+++ b/l10n/el/files_encryption.po
@@ -4,32 +4,81 @@
 # 
 # Translators:
 # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Efstathios Iosifidis <iefstathios@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 13:34+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2013-01-25 00:05+0100\n"
+"PO-Revision-Date: 2013-01-24 08:32+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Î‘Î»Î»Î±Î³Î® ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚ ÏƒÏ„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÎµÎ¹ÏƒÏŒÎ´Î¿Ï… "
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Î Î±ÏÎ±ÎºÎ±Î»ÏŽ ÎµÎ»ÎÎ³Î¾Ï„Îµ Ï„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÏƒÎ±Ï‚ ÎºÎ±Î¹ Ï€ÏÎ¿ÏƒÏ€Î±Î¸Î®ÏƒÏ„Îµ Î¾Î±Î½Î¬."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Î‘Î´Ï…Î½Î±Î¼Î¯Î± Î±Î»Î»Î±Î³Î®Ï‚ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¿Ï ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÏ„Î¿ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ ÎµÎ¹ÏƒÏŒÎ´Î¿Ï… ÏƒÎ±Ï‚"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Î•Ï€Î¹Î»Î¿Î³Î® ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "ÎšÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Î•Î¾Î±Î¯ÏÎµÏƒÎ· Ï„Ï‰Î½ Ï€Î±ÏÎ±ÎºÎ¬Ï„Ï‰ Ï„ÏÏ€Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ Î±Ï€ÏŒ Ï„Î·Î½ ÎºÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "ÎšÎ±Î¼Î¯Î±"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ· ÎšÏÏ…Ï€Ï„Î¿Î³ÏÎ¬Ï†Î·ÏƒÎ·Ï‚"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index a79674e946aef79c9773e08c75581bdfd7fc7cb7..3812c4bda0dff0ad4cd283c85e286926b9b58b56 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: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 01:26+0000\n"
-"Last-Translator: Dimitris M. <monopatis@gmail.com>\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"
 "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"
@@ -20,22 +20,10 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Î›Î®Î¾Î· ÏŒÎ»Ï‰Î½ Ï„Ï‰Î½ ÎµÎºÎ´ÏŒÏƒÎµÏ‰Î½"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Î™ÏƒÏ„Î¿ÏÎ¹ÎºÏŒ"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Î•ÎºÎ´ÏŒÏƒÎµÎ¹Ï‚"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Î‘Ï…Ï„ÏŒ Î¸Î± Î´Î¹Î±Î³ÏÎ¬ÏˆÎµÎ¹ ÏŒÎ»ÎµÏ‚ Ï„Î¹Ï‚ Ï…Ï€Î¬ÏÏ‡Î¿Ï…ÏƒÎµÏ‚ ÎµÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Ï„Ï‰Î½ Î±Î½Ï„Î¹Î³ÏÎ¬Ï†Ï‰Î½ Î±ÏƒÏ†Î±Î»ÎµÎ¯Î±Ï‚ Ï„Ï‰Î½ Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎ±Ï‚"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Î•ÎºÎ´ÏŒÏƒÎµÎ¹Ï‚ Î‘ÏÏ‡ÎµÎ¯Ï‰Î½"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index c58bb7b0af68fe96e2732b2a65a7e4bf463b8215..27ef72f2eb270ab79cea929ff5151fb9ed92c98a 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # 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: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 17:32+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 20:39+0000\n"
+"Last-Translator: xneo1 <vagelis@cyberdest.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"
@@ -18,51 +19,55 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Î’Î¿Î®Î¸ÎµÎ¹Î±"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Î ÏÎ¿ÏƒÏ‰Ï€Î¹ÎºÎ¬"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Î¡Ï…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Î§ÏÎ®ÏƒÏ„ÎµÏ‚"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î®Ï‚"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Î— Î»Î®ÏˆÎ· ZIP Î±Ï€ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î»Î·Ï†Î¸Î¿ÏÎ½ ÎÎ½Î±-ÎÎ½Î±."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Î Î¯ÏƒÏ‰ ÏƒÏ„Î± Î‘ÏÏ‡ÎµÎ¯Î±"
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Î£Ï†Î¬Î»Î¼Î± Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚"
 
@@ -82,55 +87,55 @@ msgstr "ÎšÎµÎ¯Î¼ÎµÎ½Î¿"
 msgid "Images"
 msgstr "Î•Î¹ÎºÏŒÎ½ÎµÏ‚"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Î´ÎµÏ…Ï„ÎµÏÏŒÎ»ÎµÏ€Ï„Î± Ï€ÏÎ¹Î½"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 Î»ÎµÏ€Ï„ÏŒ Ï€ÏÎ¹Î½"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d Î»ÎµÏ€Ï„Î¬ Ï€ÏÎ¹Î½"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 ÏŽÏÎ± Ï€ÏÎ¹Î½"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ÏŽÏÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ÏƒÎ®Î¼ÎµÏÎ±"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ï‡Î¸ÎÏ‚"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d Î·Î¼ÎÏÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ï„Î¿Î½ Ï€ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿ Î¼Î®Î½Î±"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d Î¼Î®Î½ÎµÏ‚ Ï€ÏÎ¹Î½"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ï„Î¿Î½ Ï€ÏÎ¿Î·Î³Î¿ÏÎ¼ÎµÎ½Î¿ Ï‡ÏÏŒÎ½Î¿"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ï‡ÏÏŒÎ½Î¹Î± Ï€ÏÎ¹Î½"
 
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index d20f3ef368cc82c8a4cc4835673e80b390a95d8a..4e99eae3d5a92454362cfca90e8d823d1e120aa1 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -13,13 +13,14 @@
 # <petros.kyladitis@gmail.com>, 2011.
 #   <petros.kyladitis@gmail.com>, 2011.
 # Petros Kyladitis <petros.kyladitis@gmail.com>, 2011-2012.
+#  <vagelis@cyberdest.com>, 2013.
 # Î“Î¹Î¬Î½Î½Î·Ï‚ Î‘Î½Î¸Ï…Î¼Î¯Î´Î·Ï‚ <yannanth@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -98,7 +99,7 @@ msgstr "Î•Î½ÎµÏÎ³Î¿Ï€Î¿Î¯Î·ÏƒÎ·"
 msgid "Saving..."
 msgstr "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__ÏŒÎ½Î¿Î¼Î±_Î³Î»ÏŽÏƒÏƒÎ±Ï‚__"
 
@@ -110,15 +111,15 @@ msgstr "Î ÏÏŒÏƒÎ¸ÎµÏƒÏ„Îµ Ï„Î· Î”Î¹ÎºÎ¹Î¬ ÏƒÎ±Ï‚ Î•Ï†Î±ÏÎ¼Î¿Î³Î®"
 msgid "More Apps"
 msgstr "Î ÎµÏÎ¹ÏƒÏƒÏŒÏ„ÎµÏÎµÏ‚ Î•Ï†Î±ÏÎ¼Î¿Î³ÎÏ‚"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Î•Ï€Î¹Î»ÎÎ¾Ï„Îµ Î¼Î¹Î± Î•Ï†Î±ÏÎ¼Î¿Î³Î®"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Î”ÎµÎ¯Ï„Îµ Ï„Î·Î½ ÏƒÎµÎ»Î¯Î´Î± ÎµÏ†Î±ÏÎ¼Î¿Î³ÏŽÎ½ ÏƒÏ„Î¿ apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Î¬Î´ÎµÎ¹Î± Î±Ï€ÏŒ <span class=\"author\"></span>"
 
@@ -167,7 +168,7 @@ msgstr "Î›Î®ÏˆÎ· Î ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±Ï„Î¿Ï‚ Android"
 msgid "Download iOS Client"
 msgstr "Î›Î®ÏˆÎ· Î ÏÎ¿Î³ÏÎ¬Î¼Î¼Î±Ï„Î¿Ï‚ iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Î£Ï…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÏŒ"
 
@@ -237,11 +238,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "ÎŒÎ½Î¿Î¼Î±"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "ÎŸÎ¼Î¬Î´ÎµÏ‚"
 
@@ -251,28 +252,32 @@ msgstr "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· "
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "Î‘Ï€ÎµÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î¿"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Î†Î»Î»Î±"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ÎŸÎ¼Î¬Î´Î± Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„ÏŽÎ½"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 14b7e75c71019960757ff22bcfb496bf04347167..9edcb771d61746fdc10b02ca966c5f47c5ec5be5 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/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: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 14:12+0000\n"
-"Last-Translator: Konstantinos Tzanidis <tzanidis@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -31,9 +31,9 @@ msgstr "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> ÎŸÎ¹ ÎµÏ†Î±ÏÎ¼Î¿Î³ÎÏ‚ user_ldap ÎºÎ±Î¹ user_web
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Î ÏÎ¿ÏƒÎ¿Ï‡Î®:</b> Î¤Î¿ PHP LDAP module Ï€Î¿Ï… Î±Ï€Î±Î¹Ï„ÎµÎ¯Ï„Î±Î¹ Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎµÎ³ÎºÎ±Ï„ÎµÏƒÏ„Î·Î¼ÎÎ½Î¿ ÎºÎ±Î¹ Î¿ Î¼Î·Ï‡Î±Î½Î¹ÏƒÎ¼ÏŒÏ‚ Î´ÎµÎ½ Î¸Î± Î»ÎµÎ¹Ï„Î¿Ï…ÏÎ³Î®ÏƒÎµÎ¹. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Î¶Î·Ï„Î®ÏƒÏ„Îµ Î±Ï€ÏŒ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® Ï„Î¿Ï… ÏƒÏ…ÏƒÏ„Î®Î¼Î±Ï„Î¿Ï‚ Î½Î± Ï„Î¿ ÎµÎ³ÎºÎ±Ï„Î±ÏƒÏ„Î®ÏƒÎµÎ¹."
+"<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 "Host"
@@ -48,6 +48,10 @@ msgstr "ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± Ï€Î±ÏÎ±Î»ÎµÎ¯ÏˆÎµÏ„Îµ Ï„Î¿ Ï€ÏÏ‰Ï„ÏŒÎºÎ¿Î»Î»Î¿,
 msgid "Base DN"
 msgstr "Base DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "ÎœÏ€Î¿ÏÎµÎ¯Ï„Îµ Î½Î± ÎºÎ±Î¸Î¿ÏÎ¯ÏƒÎµÏ„Îµ Ï„Î¿ Base DN Î³Î¹Î± Ï‡ÏÎ®ÏƒÏ„ÎµÏ‚ ÎºÎ±Î¹ Î¿Î¼Î¬Î´ÎµÏ‚ Î±Ï€ÏŒ Ï„Î·Î½ ÎºÎ±ÏÏ„ÎÎ»Î± Î ÏÎ¿Î·Î³Î¼ÎÎ½ÎµÏ‚ ÏÏ…Î¸Î¼Î¯ÏƒÎµÎ¹Ï‚"
@@ -119,10 +123,18 @@ msgstr "Î˜ÏÏÎ±"
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Group-Member association"
diff --git a/l10n/el/user_webdavauth.po b/l10n/el/user_webdavauth.po
index dff8dd88f35fcff0725656bfdc6805391cff71b1..ae9fa402bf85a1db0e5f3115e947fc857febf1e7 100644
--- a/l10n/el/user_webdavauth.po
+++ b/l10n/el/user_webdavauth.po
@@ -6,13 +6,14 @@
 # Dimitris M. <monopatis@gmail.com>, 2012.
 # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
 # Konstantinos Tzanidis <tzanidis@gmail.com>, 2012.
+# Marios Bekatoros <>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 13:55+0000\n"
-"Last-Translator: Konstantinos Tzanidis <tzanidis@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 08:10+0000\n"
+"Last-Translator: Marios Bekatoros <>\n"
 "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"
@@ -20,13 +21,17 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Î‘Ï…Î¸ÎµÎ½Ï„Î¹ÎºÎ¿Ï€Î¿Î¯Î·ÏƒÎ· Î¼ÎÏƒÏ‰ WebDAV "
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "Î¤Î¿ ownCloud Î¸Î± ÏƒÏ„ÎµÎ¯Î»ÎµÎ¹ Ï„Î± ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¬ Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ URL, Î¼ÎµÏ„Î±Ï†ÏÎ¬Î¶Î¿Î½Ï„Î±Ï‚ Ï„Î± http 401 ÎºÎ±Î¹ http 403 Ï‰Ï‚ Î»Î±Î½Î¸Î±ÏƒÎ¼ÎÎ½Î± ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¬ ÎºÎ±Î¹ ÏŒÎ»Î¿Ï…Ï‚ Ï„Î¿Ï…Ï‚ Î¬Î»Î»Î¿Ï…Ï‚ ÎºÏ‰Î´Î¹ÎºÎ¿ÏÏ‚ Ï‰Ï‚ ÏƒÏ‰ÏƒÏ„Î¬ ÏƒÏ…Î½Î¸Î·Î¼Î±Ï„Î¹ÎºÎ¬."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "Î¤Î¿ ownCloud Î¸Î± ÏƒÏ„ÎµÎ¯Î»ÎµÎ¹ Ï„Î± Î´Î¹Î±Ï€Î¹ÏƒÏ„ÎµÏ…Ï„Î®ÏÎ¹Î±  Ï‡ÏÎ®ÏƒÏ„Î· ÏƒÎµ Î±Ï…Ï„ÏŒ Ï„Î¿ URL. Î‘Ï…Ï„ÏŒ Ï„Î¿ plugin ÎµÎ»ÎÎ³Ï‡ÎµÎ¹ Ï„Î·Î½ Î±Ï€Î¬Î½Ï„Î·ÏƒÎ· ÎºÎ±Î¹ Ï„Î·Î½ Î¼ÎµÏ„Î±Ï„ÏÎÏ€ÎµÎ¹ ÏƒÎµ HTTP ÎºÏ‰Î´Î¹ÎºÏŒ ÎºÎ±Ï„Î¬ÏƒÏ„Î±ÏƒÎ·Ï‚ 401 ÎºÎ±Î¹ 403 Î³Î¹Î± Î¼Î· ÎÎ³ÎºÏ…ÏÎ±, ÏŒÎ»ÎµÏ‚ Î¿Î¹ Ï…Ï€ÏŒÎ»Î¿Î¹Ï€ÎµÏ‚ Î±Ï€Î±Î½Ï„Î®ÏƒÎµÎ¹Ï‚ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏ…ÏÎµÏ‚."
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index c400f1a7d6e24bfc9aa37a4500b67ea5e5be83ce..01b8ff631db87e4bb2e465cf46e360290871256d 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "La uzanto %s kunhavigis dosieron kun vi"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "La uzanto %s kunhavigis dosierujon kun vi"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "La uzanto %s kunhavigis la dosieron â€œ%sâ€ kun vi. Äœi elÅuteblas el tie Ä‰i: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +82,135 @@ msgstr "Neniu kategorio elektiÄis por forigo."
 msgid "Error removing %s from favorites."
 msgstr "Eraro dum forigo de %s el favoratoj."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "dimanÄ‰o"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "lundo"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "mardo"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "merkredo"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "ÄµaÅdo"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "vendredo"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "sabato"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januaro"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februaro"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Marto"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Aprilo"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Majo"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Junio"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Julio"
+
+#: js/config.php:33
+msgid "August"
+msgstr "AÅgusto"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Septembro"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktobro"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembro"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Decembro"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sekundoj antaÅe"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "antaÅ 1 minuto"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "antaÅ {minutes} minutoj"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "antaÅ 1 horo"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "antaÅ {hours} horoj"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "hodiaÅ"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "hieraÅ"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "antaÅ {days} tagoj"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "lastamonate"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "antaÅ {months} monatoj"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "monatoj antaÅe"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "lastajare"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "jaroj antaÅe"
 
@@ -164,8 +240,8 @@ msgid "The object type is not specified."
 msgstr "Ne indikiÄis tipo de la objekto."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Eraro"
 
@@ -177,123 +253,141 @@ msgstr "Ne indikiÄis nomo de la aplikaÄµo."
 msgid "The required file {file} is not installed!"
 msgstr "La necesa dosiero {file} ne instaliÄis!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Eraro dum malkunhavigo"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Eraro dum ÅanÄo de permesoj"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Kunhavigita kun vi kaj la grupo {group} de {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Kunhavigita kun vi de {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Kunhavigi kun"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Kunhavigi per ligilo"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Protekti per pasvorto"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Pasvorto"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "RetpoÅti la ligilon al ulo"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Sendi"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Agordi limdaton"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Limdato"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Kunhavigi per retpoÅto:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Ne troviÄis gento"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Kunhavigita en {item} kun {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "povas redakti"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "alirkontrolo"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "krei"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "Äisdatigi"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "forigi"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Sendante..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "La retpoÅtaÄµo sendiÄis"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "La pasvorto de ownCloud restariÄis."
@@ -445,87 +539,11 @@ msgstr "Datumbaza gastigo"
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "dimanÄ‰o"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "lundo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "mardo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "merkredo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "ÄµaÅdo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "vendredo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "sabato"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januaro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februaro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Marto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Aprilo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Majo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Junio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Julio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "AÅgusto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Septembro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktobro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Novembro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Decembro"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "TTT-servoj sub via kontrolo"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Elsaluti"
 
@@ -567,17 +585,3 @@ msgstr "jena"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sekureca averto!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Bonvolu kontroli vian pasvorton. <br/>Pro sekureco, oni okaze povas peti al vi enigi vian pasvorton ree."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Kontroli"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 9989b6eb9b59a64097b1a79d12b4ea77307c19e8..024dea90b07dd8132b157a6b17319b0114147b16 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
 # Mariano  <mstreet@kde.org.ar>, 2012.
 #   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -22,69 +23,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Ne eblis movi %s: dosiero kun Ä‰i tiu nomo jam ekzistas"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Ne eblis movi %s"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Ne eblis alinomigi dosieron"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Neniu dosiero alÅutiÄis. Nekonata eraro."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Ne estas eraro, la dosiero alÅutiÄis sukcese"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "La dosiero alÅutita superas la regulon upload_max_filesize el php.ini: "
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "La dosiero alÅutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "La alÅutita dosiero nur parte alÅutiÄis"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Neniu dosiero estas alÅutita"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Mankas tempa dosierujo"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Malsukcesis skribo al disko"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "Nevalida dosierujo."
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "Dosieroj"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Forigi"
 
@@ -92,137 +93,151 @@ msgstr "Forigi"
 msgid "Rename"
 msgstr "Alinomigi"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} jam ekzistas"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "anstataÅigi"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "sugesti nomon"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "anstataÅiÄis {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "anstataÅiÄis {new_name} per {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "malkunhaviÄis {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "foriÄis {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' ne estas valida dosiernomo."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Dosiernomo devas ne malpleni."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nevalida nomo: â€œ\\â€, â€œ/â€, â€œ<â€, â€œ>â€, â€œ:â€, â€œ\"â€, â€œ|â€, â€œ?â€ kaj â€œ*â€ ne permesatas."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generanta ZIP-dosiero, Äi povas daÅri iom da tempo"
+#: 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:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "AlÅuta eraro"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Fermi"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 dosiero estas alÅutata"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} dosieroj alÅutatas"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "La alÅuto nuliÄis."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL ne povas esti malplena."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Nevalida dosierujnomo. Uzo de â€œSharedâ€ rezervatas de Owncloud."
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} dosieroj skaniÄis"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "eraro dum skano"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nomo"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 dosierujo"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} dosierujoj"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 dosiero"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} dosierujoj"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "AlÅuti"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Dosieradministro"
@@ -271,36 +286,32 @@ msgstr "Dosierujo"
 msgid "From link"
 msgstr "El ligilo"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "AlÅuti"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Nuligi alÅuton"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas Ä‰i tie. AlÅutu ion!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ElÅuti"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "ElÅuto tro larÄa"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Nuna skano"
diff --git a/l10n/eo/files_encryption.po b/l10n/eo/files_encryption.po
index dbcedb1a56a4a24aa5782732be36a4536822f286..ee8d61876c1abd95e9b1b0058477a9227580c65f 100644
--- a/l10n/eo/files_encryption.po
+++ b/l10n/eo/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 19:41+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Äˆifrado"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Malinkluzivigi la jenajn dosiertipojn el Ä‰ifrado"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Nenio"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Kapabligi Ä‰ifradon"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 644156033198530a5422d074d95f7aa195037e4b..53a59b49120e6dca3d64074a9ed8cc20a3beb0b6 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/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: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 02:50+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Eksvalidigi Ä‰iujn eldonojn"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historio"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Eldonoj"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Äˆi tio forigos Ä‰iujn estantajn sekurkopiajn eldonojn de viaj dosieroj"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Dosiereldonigo"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index b4a219e21a2448bb69952376cec8230bed2196d6..05fd08aa22b7866c6752498b23f77f3d5d258be7 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/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: 2012-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 21:42+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Helpo"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Persona"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Agordo"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Uzantoj"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "AplikaÄµoj"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Administranto"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP-elÅuto estas malkapabligita."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elÅutiÄi unuope."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "La aplikaÄµo ne estas kapabligita"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "AÅtentiga eraro"
 
@@ -82,55 +86,55 @@ msgstr "Teksto"
 msgid "Images"
 msgstr "Bildoj"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sekundojn antaÅe"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "antaÅ 1 minuto"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "antaÅ %d minutoj"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "antaÅ 1 horo"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "antaÅ %d horoj"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hodiaÅ"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "hieraÅ"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "antaÅ %d tagoj"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "lasta monato"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "antaÅ %d monatoj"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "lasta jaro"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "jarojn antaÅe"
 
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 4c160cd36f56d3e9fbe921598c4852dacdd0f0c2..4c842f018fbafe5fbba69444ce4f5d12f748a0ca 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
 # Mariano  <mstreet@kde.org.ar>, 2012.
 #   <mstreet@kde.org.ar>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +90,7 @@ msgstr "Kapabligi"
 msgid "Saving..."
 msgstr "Konservante..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Esperanto"
 
@@ -101,41 +102,41 @@ msgstr "Aldonu vian aplikaÄµon"
 msgid "More Apps"
 msgstr "Pli da aplikaÄµoj"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Elekti aplikaÄµon"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Vidu la paÄon pri aplikaÄµoj Ä‰e apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>"
 
 #: templates/help.php:3
 msgid "User Documentation"
-msgstr ""
+msgstr "Dokumentaro por uzantoj"
 
 #: templates/help.php:4
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "Dokumentaro por administrantoj"
 
 #: templates/help.php:6
 msgid "Online Documentation"
-msgstr ""
+msgstr "Reta dokumentaro"
 
 #: templates/help.php:7
 msgid "Forum"
-msgstr ""
+msgstr "Forumo"
 
 #: templates/help.php:9
 msgid "Bugtracker"
-msgstr ""
+msgstr "Cimoraportejo"
 
 #: templates/help.php:11
 msgid "Commercial Support"
-msgstr ""
+msgstr "Komerca subteno"
 
 #: templates/personal.php:8
 #, php-format
@@ -148,17 +149,17 @@ msgstr "Klientoj"
 
 #: templates/personal.php:13
 msgid "Download Desktop Clients"
-msgstr ""
+msgstr "ElÅuti labortablajn klientojn"
 
 #: templates/personal.php:14
 msgid "Download Android Client"
-msgstr ""
+msgstr "ElÅuti Android-klienton"
 
 #: templates/personal.php:15
 msgid "Download iOS Client"
-msgstr ""
+msgstr "ElÅuti iOS-klienton"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Pasvorto"
 
@@ -208,15 +209,15 @@ msgstr "Helpu traduki"
 
 #: templates/personal.php:52
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
 #: templates/personal.php:54
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "Uzu Ä‰i tiun adreson por konekti al via ownCloud vian dosieradministrilon"
 
 #: templates/personal.php:63
 msgid "Version"
-msgstr ""
+msgstr "Eldono"
 
 #: templates/personal.php:65
 msgid ""
@@ -228,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nomo"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupoj"
 
@@ -242,28 +243,32 @@ msgstr "Krei"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "DefaÅlta konservejo"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "Senlima"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Alia"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupadministranto"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "Konservejo"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "DefaÅlta"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Forigi"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 419be520bc0c901a6e60d55d09f1a9ab2fe068f8..39f84ca0391ac07f75ea720acd26f3ae326b48e5 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
 # Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 01:34+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +28,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -42,7 +43,11 @@ msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze,
 
 #: templates/settings.php:16
 msgid "Base DN"
-msgstr "Baz-DN"
+msgstr "Bazo-DN"
+
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
 
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
@@ -115,10 +120,18 @@ msgstr "Pordo"
 msgid "Base User Tree"
 msgstr "Baza uzantarbo"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Baza gruparbo"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asocio de grupo kaj membro"
diff --git a/l10n/eo/user_webdavauth.po b/l10n/eo/user_webdavauth.po
index 60a766ad4c72bace90a8b3077751e05eb3d48fb1..d9f66ba5177fb4168c2b8e63e03b5e9160b34d1d 100644
--- a/l10n/eo/user_webdavauth.po
+++ b/l10n/eo/user_webdavauth.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Mariano <mstreet@kde.org.ar>, 2013.
 # Mariano  <mstreet@kde.org.ar>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 03:35+0000\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 01:16+0000\n"
 "Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +19,17 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV-aÅtentigo"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/es/core.po b/l10n/es/core.po
index 9428f0db0490121cfc81835263476da0d8becc4d..03aade72afd6b0476421b7f02e41661aa1cde07d 100644
--- a/l10n/es/core.po
+++ b/l10n/es/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -28,24 +28,24 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "El usuario %s ha compartido un archivo contigo"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "El usuario %s ha compartido una carpeta contigo"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquÃ: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -90,59 +90,135 @@ msgstr "No hay categorÃas seleccionadas para borrar."
 msgid "Error removing %s from favorites."
 msgstr "Error eliminando %s de los favoritos."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Domingo"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Lunes"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Martes"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "MiÃ©rcoles"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Jueves"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Viernes"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "SÃ¡bado"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Enero"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Febrero"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Marzo"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Abril"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mayo"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Junio"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Julio"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Agosto"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Septiembre"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Octubre"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Noviembre"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Diciembre"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "Hace {hours} horas"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "hace {days} dÃas"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "mes pasado"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "Hace {months} meses"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "hace meses"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "aÃ±o pasado"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "hace aÃ±os"
 
@@ -172,8 +248,8 @@ msgid "The object type is not specified."
 msgstr "El tipo de objeto no se ha especificado."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Fallo"
 
@@ -185,123 +261,141 @@ msgstr "El nombre de la app no se ha especificado."
 msgid "The required file {file} is not installed!"
 msgstr "El fichero  {file} requerido, no estÃ¡ instalado."
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Error compartiendo"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Error descompartiendo"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Error cambiando permisos"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido contigo y el grupo {group} por {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Compartido contigo por {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Compartir con enlace"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Protegido por contraseÃ±a"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Enviar un enlace por correo electrÃ³nico a una persona"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "compartido via e-mail:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "No se encontrÃ³ gente"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "No compartir"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "modificar"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protegido por contraseÃ±a"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Error al eliminar la fecha de caducidad"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Correo electrÃ³nico enviado"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "Reiniciar contraseÃ±a de ownCloud"
@@ -453,87 +547,11 @@ msgstr "Host de la base de datos"
 msgid "Finish setup"
 msgstr "Completar la instalaciÃ³n"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Domingo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Lunes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Martes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "MiÃ©rcoles"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Jueves"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Viernes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "SÃ¡bado"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Enero"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Febrero"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Marzo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Abril"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mayo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Junio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Julio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Agosto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Septiembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Octubre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Noviembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Diciembre"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "servicios web bajo tu control"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Salir"
 
@@ -575,17 +593,3 @@ msgstr "siguiente"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Actualizando ownCloud a la versiÃ³n %s, esto puede demorar un tiempo."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Â¡Advertencia de seguridad!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Por favor verifique su contraseÃ±a. <br/>Por razones de seguridad se le puede volver a preguntar ocasionalmente la contraseÃ±a."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 1275e717a26edb810d0a811d9a21caace2c24b3e..db49dbe66b4669bd484f7dd31c414022a86b9229 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 07:26+0000\n"
-"Last-Translator: karv <karvayoEdgar@gmail.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -40,46 +40,46 @@ msgstr "No se puede mover %s"
 msgid "Unable to rename file"
 msgstr "No se puede renombrar el archivo"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Fallo no se subiÃ³ el fichero"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "No se ha producido ningÃºn error, el archivo se ha subido con Ã©xito"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "El archivo que intentas subir sobrepasa el tamaÃ±o definido por la variable upload_max_filesize en php.ini"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo que intentas subir sobrepasa el tamaÃ±o definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo que intentas subir solo se subiÃ³ parcialmente"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "No se ha subido ningÃºn archivo"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Falta un directorio temporal"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "La escritura en disco ha fallado"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
@@ -87,11 +87,11 @@ msgstr "Directorio invalido."
 msgid "Files"
 msgstr "Archivos"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -99,137 +99,151 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Renombrar"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "reemplazado {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "{files} descompartidos"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} eliminados"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' es un nombre de archivo invÃ¡lido."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "El nombre de archivo no puede estar vacÃo."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nombre Invalido, \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no estÃ¡n permitidos "
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generando un fichero ZIP, puede llevar un tiempo."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "cerrrar"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "subiendo 1 archivo"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "Subiendo {count} archivos"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacÃa."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Nombre de carpeta invalido. El uso de \"Shared\" esta reservado para Owncloud"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} archivos escaneados"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "error escaneando"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 carpeta"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} carpetas"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} archivos"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Subir"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Tratamiento de archivos"
@@ -278,36 +292,32 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Desde el enlace"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Subir"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "AquÃ no hay nada. Â¡Sube algo!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "El archivo es demasiado grande"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Se estÃ¡n escaneando los archivos, por favor espere."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Ahora escaneando"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 9b75acf31d7df3d3bf8862a25027a15da5745909..14b030edb0e386e2fd4b57ca2382920d5e13a561 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.po
@@ -3,33 +3,83 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Felix Liberio <felix.liberio@gmail.com>, 2013.
 #   <juanma@kde.org.ar>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 05:27+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 22:40+0000\n"
+"Last-Translator: felix.liberio <felix.liberio@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Por favor, cambie su cliente de ownCloud y cambie su clave de cifrado para completar la conversiÃ³n."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "Cambiar a encriptaciÃ³n en lado cliente"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Cambie la clave de cifrado para ingresar su contraseÃ±a"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Por favor revise su contraseÃ±a e intentelo de nuevo."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Elegir el modo de encriptado:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Excluir del cifrado los siguientes tipos de archivo"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ninguno"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Habilitar cifrado"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index b928098bf8c4d641f479543e9058294750504dcf..41ca2e67dad95be3051cb49025f51c8e7f9d6916 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -11,9 +11,9 @@ 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 05:59+0000\n"
-"Last-Translator: scambra <sergio@entrecables.com>\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"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,22 +21,10 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirar todas las versiones"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historial"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versiones"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Esto eliminarÃ¡ todas las versiones guardadas como copia de seguridad de tus archivos"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionado de archivos"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 179b6bff7d6861372c8e54750848a06be757f250..38c6ee28554826597d9f614fe53b7ed9fd9abc72 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
 #   <juanma@kde.org.ar>, 2012.
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
 # RubÃ©n Trujillo <rubentrf@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: 2012-11-18 00:01+0100\n"
-"PO-Revision-Date: 2012-11-17 08:43+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 02:14+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,51 +22,55 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP estÃ¡ desactivada."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "no pudo ser determinado"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "La aplicaciÃ³n no estÃ¡ habilitada"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Error de autenticaciÃ³n"
 
@@ -85,55 +90,55 @@ msgstr "Texto"
 msgid "Images"
 msgstr "ImÃ¡genes"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "hace segundos"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "hace %d minutos"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Hace %d horas"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hoy"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "ayer"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "hace %d dÃas"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "este mes"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Hace %d meses"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "este aÃ±o"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "hace aÃ±os"
 
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index d39042253ff59255c6be3757a2da16922649f641..d650521c6f860ce279bfc0d905f376892e31882b 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -99,7 +99,7 @@ msgstr "Activar"
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Castellano"
 
@@ -111,15 +111,15 @@ msgstr "AÃ±ade tu aplicaciÃ³n"
 msgid "More Apps"
 msgstr "MÃ¡s aplicaciones"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Seleccionar una aplicaciÃ³n"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
@@ -168,7 +168,7 @@ msgstr "Descargar cliente para android"
 msgid "Download iOS Client"
 msgstr "Descargar cliente para iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ContraseÃ±a"
 
@@ -238,11 +238,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nombre"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupos"
 
@@ -254,26 +254,30 @@ msgstr "Crear"
 msgid "Default Storage"
 msgstr "Almacenamiento Predeterminado"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Alamacenamiento"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predeterminado"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 32c72e60755b3143f48abf1d51c2b6b686e9483f..8a1cee622ddd1f7b1f0718dfebf1b13567544647 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.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-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 00:58+0000\n"
-"Last-Translator: valarauco <manudeloz86@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,9 +32,9 @@ msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibl
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Advertencia:</b> El mÃ³dulo PHP LDAP necesario no estÃ¡ instalado, el sistema no funcionarÃ¡. Pregunte al administrador del sistema para instalarlo."
+"<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 "Host"
@@ -49,6 +49,10 @@ msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece
 msgid "Base DN"
 msgstr "DN base"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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"
@@ -120,10 +124,18 @@ msgstr "Puerto"
 msgid "Base User Tree"
 msgstr "Ãrbol base de usuario"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Ãrbol base de grupo"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "AsociaciÃ³n Grupo-Miembro"
diff --git a/l10n/es/user_webdavauth.po b/l10n/es/user_webdavauth.po
index 8eec33bde1700c81624e7e6cae55573c29a37ef4..c3d87548a9b53165674a81a7c23b9b836d71bbac 100644
--- a/l10n/es/user_webdavauth.po
+++ b/l10n/es/user_webdavauth.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
 # Art O. Pal <artopal@fastmail.fm>, 2012.
 #   <pggx999@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 19:17+0000\n"
-"Last-Translator: pggx999 <pggx999@gmail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 02:31+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
 "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"
@@ -19,13 +20,17 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "AutenticaciÃ³n de WevDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud enviarÃ¡ al usuario las interpretaciones 401 y 403 a esta URL como incorrectas y todas las otras credenciales como correctas"
+"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 "onwCloud enviarÃ¡ las credenciales de usuario a esta URL. Este complemento verifica la respuesta e interpretarÃ¡ los cÃ³digos de respuesta HTTP 401 y 403 como credenciales invÃ¡lidas y todas las otras respuestas como credenciales vÃ¡lidas."
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 7eea07cc00b860ce86f6bb8c24546a58ebee0d2c..65487408405ad5fdd075344a72fbc67d7923d81b 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <claudio.tessone@gmail.com>, 2012.
+#   <claudio.tessone@gmail.com>, 2012-2013.
 #   <javierkaiser@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "El usurario %s compartiÃ³ un archivo con vos."
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "El usurario %s compartiÃ³ una carpeta con vos."
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "El usuario %s compartiÃ³ el archivo \"%s\" con vos. EstÃ¡ disponible para su descarga aquÃ: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,59 +81,135 @@ msgstr "No hay categorÃas seleccionadas para borrar."
 msgid "Error removing %s from favorites."
 msgstr "Error al remover %s de favoritos. "
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Domingo"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Lunes"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Martes"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "MiÃ©rcoles"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Jueves"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Viernes"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "SÃ¡bado"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Enero"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Febrero"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Marzo"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Abril"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mayo"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Junio"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Julio"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Agosto"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Septiembre"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Octubre"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Noviembre"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Diciembre"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "hace {minutes} minutos"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Hace 1 hora"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrÃ¡s"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "hoy"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "ayer"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "hace {days} dÃas"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "el mes pasado"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} meses atrÃ¡s"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "el aÃ±o pasado"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "aÃ±os atrÃ¡s"
 
@@ -163,8 +239,8 @@ msgid "The object type is not specified."
 msgstr "El tipo de objeto no esta especificado. "
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Error"
 
@@ -176,123 +252,141 @@ msgstr "El nombre de la aplicaciÃ³n no esta especificado."
 msgid "The required file {file} is not installed!"
 msgstr "Â¡El archivo requerido {file} no estÃ¡ instalado!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Error en el procedimiento de "
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permisos"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vos y el grupo {group} por {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vos por {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Compartir con link"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Proteger con contraseÃ±a "
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ContraseÃ±a"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Enviar el link por e-mail."
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Asignar fecha de vencimiento"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Fecha de vencimiento"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "compartido a travÃ©s de e-mail:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "No se encontraron usuarios"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Remover compartir"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protegido por contraseÃ±a"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de caducidad"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Email enviado"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "Restablecer contraseÃ±a de ownCloud"
@@ -444,87 +538,11 @@ msgstr "Host de la base de datos"
 msgid "Finish setup"
 msgstr "Completar la instalaciÃ³n"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Domingo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Lunes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Martes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "MiÃ©rcoles"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Jueves"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Viernes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "SÃ¡bado"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Enero"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Febrero"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Marzo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Abril"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mayo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Junio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Julio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Agosto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Septiembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Octubre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Noviembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Diciembre"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "servicios web sobre los que tenÃ©s control"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Cerrar la sesiÃ³n"
 
@@ -565,18 +583,4 @@ msgstr "siguiente"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Â¡Advertencia de seguridad!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Por favor, verificÃ¡ tu contraseÃ±a. <br/>Por razones de seguridad, puede ser que que te pregunte ocasionalmente la contraseÃ±a."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
+msgstr "Actualizando ownCloud a la versiÃ³n %s, puede domorar un rato."
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index d3f2c7ebc1577e3be4cc4d2cae9b729f230fab6c..7de3e1c837a1ff8209978c0fe92b330b56fe9df6 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012-2013.
-#   <claudio.tessone@gmail.com>, 2012.
+#   <claudio.tessone@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -22,57 +22,57 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "No se pudo mover %s - Un archivo con este nombre ya existe"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "No se pudo mover %s "
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "No fue posible cambiar el nombre al archivo"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "El archivo no fue subido. Error desconocido"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "No se han producido errores, el archivo se ha subido con Ã©xito"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "El archivo que intentÃ¡s subir excede el tamaÃ±o definido por upload_max_filesize en el php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "El archivo que intentÃ¡s subir sobrepasa el tamaÃ±o definido por la variable MAX_FILE_SIZE especificada en el formulario HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "El archivo que intentÃ¡s subir solo se subiÃ³ parcialmente"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "El archivo no fue subido"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Falta un directorio temporal"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Error al escribir en el disco"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "No hay suficiente espacio disponible"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Directorio invalido."
 
@@ -80,11 +80,11 @@ msgstr "Directorio invalido."
 msgid "Files"
 msgstr "Archivos"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Dejar de compartir"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Borrar"
 
@@ -92,137 +92,151 @@ msgstr "Borrar"
 msgid "Rename"
 msgstr "Cambiar nombre"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} ya existe"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "sugerir nombre"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "reemplazado {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "reemplazado {new_name} con {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "{files} se dejaron de compartir"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} borrados"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' es un nombre de archivo invÃ¡lido."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "El nombre del archivo no puede quedar vacÃo."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no estÃ¡n permitidos."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generando un archivo ZIP, puede llevar un tiempo."
+#: 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:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Cerrar"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Subiendo 1 archivo"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "Subiendo {count} archivos"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "La subida fue cancelada"
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "La URL no puede estar vacÃa"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Nombre de carpeta invÃ¡lido. El uso de 'Shared' estÃ¡ reservado por ownCloud"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} archivos escaneados"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "error mientras se escaneaba"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nombre"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 directorio"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} directorios"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 archivo"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} archivos"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Subir"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Tratamiento de archivos"
@@ -271,36 +285,32 @@ msgstr "Carpeta"
 msgid "From link"
 msgstr "Desde enlace"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Subir"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "No hay nada. Â¡SubÃ contenido!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "El archivo es demasiado grande"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Se estÃ¡n escaneando los archivos, por favor esperÃ¡."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Escaneo actual"
diff --git a/l10n/es_AR/files_encryption.po b/l10n/es_AR/files_encryption.po
index 16b134f329dbe40a1e287efbc06eda8759ad9034..63c4ec00584e59ddeca8f81a774ed9ffa4e09e4f 100644
--- a/l10n/es_AR/files_encryption.po
+++ b/l10n/es_AR/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 04:41+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "EncriptaciÃ³n"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Exceptuar de la encriptaciÃ³n los siguientes tipos de archivo"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ninguno"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Habilitar encriptaciÃ³n"
diff --git a/l10n/es_AR/files_versions.po b/l10n/es_AR/files_versions.po
index 51e4552b00098dfbd5cf3608e1950d84e2e19fef..6ab1eed54d33eebfe2d256c491ad934fde971480 100644
--- a/l10n/es_AR/files_versions.po
+++ b/l10n/es_AR/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: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 04:28+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirar todas las versiones"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historia"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versiones"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Hacer estom borrarÃ¡ todas las versiones guardadas como copia de seguridad de tus archivos"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionado de archivos"
diff --git a/l10n/es_AR/lib.po b/l10n/es_AR/lib.po
index d7c4a911766125fbe83094158a2f216aef634bd5..0b6fd72855b184ecc55e129cb2ec507a28da96a8 100644
--- a/l10n/es_AR/lib.po
+++ b/l10n/es_AR/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2013.
 #   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-22 00:01+0100\n"
-"PO-Revision-Date: 2012-11-21 09:56+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-20 03:00+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +19,55 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP estÃ¡ desactivada."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados de a uno."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Volver a archivos"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "no pudo ser determinado"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "La aplicaciÃ³n no estÃ¡ habilitada"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Error de autenticaciÃ³n"
 
@@ -82,55 +87,55 @@ msgstr "Texto"
 msgid "Images"
 msgstr "ImÃ¡genes"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "hace unos segundos"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "hace 1 minuto"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "hace %d minutos"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 hora atrÃ¡s"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d horas atrÃ¡s"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hoy"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "ayer"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "hace %d dÃas"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "este mes"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d meses atrÃ¡s"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "este aÃ±o"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "hace aÃ±os"
 
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index 0ebdce38b5883239badb3312178db50994e03df5..e5e3ae2bc0103251a25cd3cb6605e85d3b22b133 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Activar"
 msgid "Saving..."
 msgstr "Guardando..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Castellano (Argentina)"
 
@@ -101,15 +101,15 @@ msgstr "AÃ±adÃ tu aplicaciÃ³n"
 msgid "More Apps"
 msgstr "MÃ¡s aplicaciones"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Seleccionar una aplicaciÃ³n"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "MirÃ¡ la web de aplicaciones apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\">"
 
@@ -158,7 +158,7 @@ msgstr "Descargar cliente de Android"
 msgid "Download iOS Client"
 msgstr "Descargar cliente de iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ContraseÃ±a"
 
@@ -228,11 +228,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nombre"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupos"
 
@@ -244,26 +244,30 @@ msgstr "Crear"
 msgid "Default Storage"
 msgstr "Almacenamiento Predeterminado"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Otro"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Almacenamiento"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predeterminado"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Borrar"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 4ceff26caa17f0d8125a9c451dd3f0f22296ece2..a3b11101f5bd1284e51fe1c45fea762041c5c203 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/user_ldap.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-04 13:22+0100\n"
-"PO-Revision-Date: 2013-01-04 05:53+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,9 @@ msgstr "<b>Advertencia:</b> Los Apps user_ldap y user_webdavauth son incompatibl
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Advertencia:</b> El mÃ³dulo PHP LDAP necesario no estÃ¡ instalado, el sistema no funcionarÃ¡. Pregunte al administrador del sistema para instalarlo."
+"<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 "Host"
@@ -45,6 +45,10 @@ msgstr "PodÃ©s omitir el protocolo, excepto si SSL es requerido. En ese caso, em
 msgid "Base DN"
 msgstr "DN base"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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\""
@@ -116,10 +120,18 @@ msgstr "Puerto"
 msgid "Base User Tree"
 msgstr "Ãrbol base de usuario"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Ãrbol base de grupo"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "AsociaciÃ³n Grupo-Miembro"
diff --git a/l10n/es_AR/user_webdavauth.po b/l10n/es_AR/user_webdavauth.po
index 5eb7c5b084bd09dc827fcaaa89792d5c19fb40bb..429680ee8c61410c8b9ebec7dc281963882aee86 100644
--- a/l10n/es_AR/user_webdavauth.po
+++ b/l10n/es_AR/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 21:34+0000\n"
-"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\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"
 "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,13 +19,17 @@ msgstr ""
 "Language: es_AR\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 "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud enviarÃ¡ las credenciales a esta direcciÃ³n, si son interpretadas como http 401 o http 403 las credenciales son erroneas; todos los otros cÃ³digos indican que las credenciales son correctas."
+"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/et_EE/core.po b/l10n/et_EE/core.po
index 929be2741d6876144f4d2f90f9c76f67b6afa255..62f3fd70152074b00e1b2034d51ee8a068812ba1 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr "Kustutamiseks pole kategooriat valitud."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "PÃ¼hapÃ¤ev"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "EsmaspÃ¤ev"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "TeisipÃ¤ev"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "KolmapÃ¤ev"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "NeljapÃ¤ev"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Reede"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "LaupÃ¤ev"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Jaanuar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Veebruar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "MÃ¤rts"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Aprill"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juuni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juuli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktoober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Detsember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutit tagasi"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "tÃ¤na"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} pÃ¤eva tagasi"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Viga"
 
@@ -175,123 +251,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Viga jagamise lÃµpetamisel"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Viga Ãµiguste muutmisel"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Sinuga jagas {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Jaga"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Jaga lingiga"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Parool"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "MÃ¤Ã¤ra aegumise kuupÃ¤ev"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Aegumise kuupÃ¤ev"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Jaga e-postiga:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Ãœhtegi inimest ei leitud"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Edasijagamine pole lubatud"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "LÃµpeta jagamine"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "saab muuta"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ligipÃ¤Ã¤sukontroll"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "loo"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "uuenda"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "kustuta"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupÃ¤eva eemaldamisel"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupÃ¤eva mÃ¤Ã¤ramisel"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud parooli taastamine"
@@ -443,87 +537,11 @@ msgstr "Andmebaasi host"
 msgid "Finish setup"
 msgstr "LÃµpeta seadistamine"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "PÃ¼hapÃ¤ev"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "EsmaspÃ¤ev"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "TeisipÃ¤ev"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "KolmapÃ¤ev"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "NeljapÃ¤ev"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Reede"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "LaupÃ¤ev"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Jaanuar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Veebruar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "MÃ¤rts"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Aprill"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juuni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juuli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktoober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Detsember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Logi vÃ¤lja"
 
@@ -565,17 +583,3 @@ msgstr "jÃ¤rgm"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "turvahoiatus!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Kinnita"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 444a31d0214c1a3067e15f2b3be8d61138dfe2fb..ad6acde581cca9ea2fd10f821b1a52b371755d3b 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Ãœhtegi faili ei laetud Ã¼les. Tundmatu viga"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Ãœhtegi viga pole, fail on Ã¼les laetud"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ãœles laetud faili suurus Ã¼letab HTML vormis mÃ¤Ã¤ratud upload_max_filesize suuruse"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fail laeti Ã¼les ainult osaliselt"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ãœhtegi faili ei laetud Ã¼les"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Ajutiste failide kaust puudub"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Kettale kirjutamine ebaÃµnnestus"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Files"
 msgstr "Failid"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "LÃµpeta jagamine"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -92,137 +92,151 @@ msgstr "Kustuta"
 msgid "Rename"
 msgstr "Ã¼mber"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} on juba olemas"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "soovita nime"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "asendatud nimega {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "asendas nime {old_name} nimega {new_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "jagamata {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "kustutatud {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP-faili loomine, see vÃµib veidi aega vÃµtta."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Ãœleslaadimise viga"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Sulge"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 faili Ã¼leslaadimisel"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} faili Ã¼leslaadimist"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Ãœleslaadimine tÃ¼histati."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL ei saa olla tÃ¼hi."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} faili skÃ¤nnitud"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "viga skÃ¤nnimisel"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 kaust"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} kausta"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 fail"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} faili"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Lae Ã¼les"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Failide kÃ¤sitlemine"
@@ -271,36 +285,32 @@ msgstr "Kaust"
 msgid "From link"
 msgstr "Allikast"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Lae Ã¼les"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "TÃ¼hista Ã¼leslaadimine"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi Ã¼les!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Ãœleslaadimine on liiga suur"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Praegune skannimine"
diff --git a/l10n/et_EE/files_encryption.po b/l10n/et_EE/files_encryption.po
index 8a0593fa3371b804710169e936fbc8ec77cd8c6e..eb1004d7beff18680bee98d453e5697d92eae6e3 100644
--- a/l10n/et_EE/files_encryption.po
+++ b/l10n/et_EE/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 06:39+0000\n"
-"Last-Translator: Rivo ZÃ¤ngov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "KrÃ¼pteerimine"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "JÃ¤rgnevaid failitÃ¼Ã¼pe Ã¤ra krÃ¼pteeri"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Pole"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Luba krÃ¼pteerimine"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index a0d4710bcd42126317ec1100fe73c63bfbb3e838..a0309a22fc6dfedbbe3735415c1fca60b450ad0d 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: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 20:09+0000\n"
-"Last-Translator: Rivo ZÃ¤ngov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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,22 +18,10 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "KÃµikide versioonide aegumine"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Ajalugu"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versioonid"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "See kustutab kÃµik sinu failidest tehtud varuversiooni"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Failide versioonihaldus"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index f617ebc7835e135a00694ae354373ee674709cb2..a137f08e4a3d56e3610c21b31a8c0f7d0022a738 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+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,51 +18,55 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Abiinfo"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Isiklik"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Seaded"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Kasutajad"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Rakendused"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on vÃ¤lja lÃ¼litatud."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida Ã¼kshaaval."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Rakendus pole sisse lÃ¼litatud"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Autentimise viga"
 
@@ -82,55 +86,55 @@ msgstr "Tekst"
 msgid "Images"
 msgstr "Pildid"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutit tagasi"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "tÃ¤na"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "eile"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d pÃ¤eva tagasi"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "eelmisel kuul"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "eelmisel aastal"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "aastat tagasi"
 
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 751dc61daf4aaad492936b3ada4cb70914339fc5..3f55c73885192bfd3ddea042bddd1703e6347a99 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "LÃ¼lita sisse"
 msgid "Saving..."
 msgstr "Salvestamine..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Eesti"
 
@@ -101,15 +101,15 @@ msgstr "Lisa oma rakendus"
 msgid "More Apps"
 msgstr "Veel rakendusi"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vali programm"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>"
 
@@ -158,7 +158,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Parool"
 
@@ -228,11 +228,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nimi"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupid"
 
@@ -244,26 +244,30 @@ msgstr "Lisa"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupi admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Kustuta"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index c8207cb04672b459f55a11b5db7e7c92fdedc3c6..f0bcf31f96a08f1335395da4dcb61fb3c3308534 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr "Sa ei saa protokolli Ã¤ra jÃ¤tta, vÃ¤lja arvatud siis, kui sa nÃµuad SSL
 msgid "Base DN"
 msgstr "Baas DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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"
@@ -115,10 +119,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "Baaskasutaja puu"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Baasgrupi puu"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Grupiliikme seotus"
diff --git a/l10n/et_EE/user_webdavauth.po b/l10n/et_EE/user_webdavauth.po
index 2e1b479cbe8d8c93e45d89dd36bb236689977b25..a2ccf77cee8cc6145abeaa53f22c8f8f4c6a200b 100644
--- a/l10n/et_EE/user_webdavauth.po
+++ b/l10n/et_EE/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: et_EE\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/eu/core.po b/l10n/eu/core.po
index ace5f9e642e4a49b9deaec9ac01b442d454b66ec..7bc85012c50c47de8054ad71047261a64a20bfbb 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <asieriko@gmail.com>, 2013.
 #   <asieriko@gmail.com>, 2012.
 # Asier Urio Larrea <asieriko@gmail.com>, 2011.
 # Piarres Beobide <pi@beobide.net>, 2012.
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,24 +21,24 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "%s erabiltzaileak zurekin fitxategi bat partekatu du "
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s erabiltzaileak zurekin karpeta bat partekatu du "
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +83,135 @@ msgstr "Ez da ezabatzeko kategoriarik hautatu."
 msgid "Error removing %s from favorites."
 msgstr "Errorea gertatu da %s gogokoetatik ezabatzean."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Igandea"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Astelehena"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Asteartea"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Asteazkena"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Osteguna"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Ostirala"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Larunbata"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Urtarrila"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Otsaila"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Martxoa"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Apirila"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maiatza"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Ekaina"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Uztaila"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Abuztua"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Iraila"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Urria"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Azaroa"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Abendua"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "segundu"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "orain dela {minutes} minutu"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "orain dela ordu bat"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "orain dela {hours} ordu"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "gaur"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "atzo"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "orain dela {days} egun"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "joan den hilabetean"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "orain dela {months} hilabete"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "hilabete"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "joan den urtean"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "urte"
 
@@ -164,8 +241,8 @@ msgid "The object type is not specified."
 msgstr "Objetu mota ez dago zehaztuta."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Errorea"
 
@@ -177,123 +254,141 @@ msgstr "App izena ez dago zehaztuta."
 msgid "The required file {file} is not installed!"
 msgstr "Beharrezkoa den {file} fitxategia ez dago instalatuta!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Errore bat egon da elkarbanaketa desegitean"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Errore bat egon da baimenak aldatzean"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}-k zu eta {group} taldearekin partekatuta"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "{owner}-k zurekin partekatuta"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Elkarbanatu honekin"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Elkarbanatu lotura batekin"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Babestu pasahitzarekin"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Pasahitza"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Postaz bidali lotura "
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Bidali"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Ezarri muga data"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Muga data"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Elkarbanatu eposta bidez:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Ez da inor aurkitu"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "{user}ekin {item}-n partekatuta"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "editatu dezake"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "sarrera kontrola"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "sortu"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "eguneratu"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "ezabatu"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Bidaltzen ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Eposta bidalia"
 
+#: 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 "Eguneraketa ez da ongi egin. Mesedez egin arazoaren txosten bat <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud komunitatearentzako</a>."
+
+#: js/update.js:18
+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
 msgid "ownCloud password reset"
 msgstr "ownCloud-en pasahitza berrezarri"
@@ -445,87 +540,11 @@ msgstr "Datubasearen hostalaria"
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Igandea"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Astelehena"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Asteartea"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Asteazkena"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Osteguna"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Ostirala"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Larunbata"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Urtarrila"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Otsaila"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Martxoa"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Apirila"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maiatza"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Ekaina"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Uztaila"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Abuztua"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Iraila"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Urria"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Azaroa"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Abendua"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Saioa bukatu"
 
@@ -566,18 +585,4 @@ msgstr "hurrengoa"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Segurtasun abisua"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Mesedez egiaztatu zure pasahitza. <br/>Segurtasun arrazoiengatik noizbehinka zure pasahitza berriz sartzea eska diezazukegu."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Egiaztatu"
+msgstr "ownCloud %s bertsiora eguneratzen, denbora har dezake."
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 0cc98cedbd109999592e8439e58bc164c0653e52..a769d2ce3c3458194728e06c4f078ab30d61c357 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <asieriko@gmail.com>, 2013.
 #   <asieriko@gmail.com>, 2012.
 # Asier Urio Larrea <asieriko@gmail.com>, 2011.
-# Piarres Beobide <pi@beobide.net>, 2012.
+# Piarres Beobide <pi@beobide.net>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-28 00:04+0100\n"
+"PO-Revision-Date: 2013-01-27 15:41+0000\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\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"
@@ -23,69 +24,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Ezin dira fitxategiak mugitu %s"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Ezin izan da fitxategia berrizendatu"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Ez da fitxategirik igo. Errore ezezaguna"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Ez da arazorik izan, fitxategia ongi igo da"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Igotako fitxategiaren zati bat baino gehiago ez da igo"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ez da fitxategirik igo"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Aldi baterako karpeta falta da"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Errore bat izan da diskoan idazterakoan"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr ""
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Ez dago behar aina leku erabilgarri,"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "Baliogabeko karpeta."
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -93,137 +94,151 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "ordezkatua {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "elkarbanaketa utzita {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "ezabatuta {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' ez da fitxategi izen baliogarria."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Fitxategi izena ezin da hutsa izan."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Zure biltegiratzea beterik dago, ezingo duzu aurrerantzean fitxategirik igo edo sinkronizatu!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Zure biltegiratzea nahiko beterik dago (%{usedSpacePercent})"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Igotzean errore bat suertatu da"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Itxi"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Zain"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "fitxategi 1 igotzen"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} fitxategi igotzen"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URLa ezin da hutsik egon."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Baliogabeako karpeta izena. 'Shared' izena Owncloudek erreserbatzen du"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} fitxategi eskaneatuta"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "errore bat egon da eskaneatzen zen bitartean"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Igo"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Fitxategien kudeaketa"
@@ -272,36 +287,32 @@ msgstr "Karpeta"
 msgid "From link"
 msgstr "Estekatik"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Igo"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Igotakoa handiegia da"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index cd97e58a49765800f735a611b930c8488c82ada0..4e6b0c18e04a1205c539a0bdae7572c5df243ade 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -3,33 +3,82 @@
 # 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 09:08+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 18: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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Mesedez egiaztatu zure pasahitza eta saia zaitez berriro:"
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Hautatu enkriptazio modua:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Bat ere ez (enkriptaziorik gabe)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "Erabiltzaileak zehaztuta (utzi erabiltzaileari hautatzen)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Enkriptazioa"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ez enkriptatu hurrengo fitxategi motak"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Bat ere ez"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Gaitu enkriptazioa"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 471bd1ee586ee0a42dbc2fa8cbb3857f10565408..64844cd7adf72375e7cc172821372434a3f57709 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/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: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 13:25+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Iraungi bertsio guztiak"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historia"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Bertsioak"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Honek zure fitxategien bertsio guztiak ezabatuko ditu"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Fitxategien Bertsioak"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index 9442caf83a921c3215d0b1d580081bdef59ba845..9ba6d45bb6d8da4c096be89be260a02440737927 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.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-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-25 23:10+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 00:06+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,51 +19,55 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Laguntza"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Aplikazioak"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP deskarga ez dago gaituta."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Itzuli fitxategietara"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "ezin izan da zehaztu"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplikazioa ez dago gaituta"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Autentikazio errorea"
 
@@ -82,55 +87,55 @@ msgstr "Testua"
 msgid "Images"
 msgstr "Irudiak"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "orain dela segundu batzuk"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "orain dela %d minutu"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "orain dela ordu bat"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "orain dela %d ordu"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "gaur"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "atzo"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "orain dela %d egun"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "joan den hilabetea"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "orain dela %d hilabete"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "joan den urtea"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "orain dela urte batzuk"
 
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index b696af989de27130b3aac4a6d58018ea5d1501b7..9ff185b18fb3ae43600240bbc11641d229cd2305 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <asieriko@gmail.com>, 2013.
 #   <asieriko@gmail.com>, 2012.
 # Asier Urio Larrea <asieriko@gmail.com>, 2011.
 # Piarres Beobide <pi@beobide.net>, 2012.
@@ -10,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +91,7 @@ msgstr "Gaitu"
 msgid "Saving..."
 msgstr "Gordetzen..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Euskera"
 
@@ -102,15 +103,15 @@ msgstr "Gehitu zure aplikazioa"
 msgid "More Apps"
 msgstr "App gehiago"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Aukeratu programa bat"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Ikusi programen orria apps.owncloud.com en"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
 
@@ -159,7 +160,7 @@ msgstr "Deskargatu Android bezeroa"
 msgid "Download iOS Client"
 msgstr "Deskargatu iOS bezeroa"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Pasahitza"
 
@@ -229,11 +230,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Izena"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Taldeak"
 
@@ -243,28 +244,32 @@ msgstr "Sortu"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "Lehenetsitako Biltegiratzea"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "Mugarik gabe"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Besteak"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Talde administradorea"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "Biltegiratzea"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "Lehenetsia"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Ezabatu"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 6184b2abf9d8937785e5075e3be25ea8b8970f1e..546e28b0d7570343be1fd78a4febbc816df662a5 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.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:38+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 00:01+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"
@@ -27,8 +28,8 @@ msgstr "<b>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak di
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
 msgstr "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan."
 
 #: templates/settings.php:15
@@ -44,6 +45,10 @@ msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada ha
 msgid "Base DN"
 msgstr "Oinarrizko DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "DN Oinarri bat lerroko"
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
@@ -115,10 +120,18 @@ msgstr "Portua"
 msgid "Base User Tree"
 msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Erabiltzaile DN Oinarri bat lerroko"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Oinarrizko Talde Zuhaitza"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Talde DN Oinarri bat lerroko"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
diff --git a/l10n/eu/user_webdavauth.po b/l10n/eu/user_webdavauth.po
index 0f039352404c4f299f1d6e0e6a00238d91039cc8..ada89a92f4d221189fb7dc503c3ca010f2cd25e3 100644
--- a/l10n/eu/user_webdavauth.po
+++ b/l10n/eu/user_webdavauth.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:58+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-18 23:47+0000\n"
 "Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +19,17 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Autentikazioa"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud erabiltzailearen kredentzialak helbide honetara bidaliko ditu. http 401 eta http 403 kredentzial ez zuzenak bezala hartuko dira eta beste kode guztiak kredentzial zuzentzat hartuko dira."
+"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 "ownCloudek erabiltzailearen kredentzialak URL honetara bidaliko ditu. Plugin honek erantzuna aztertzen du eta HTTP 401 eta 403 egoera kodeak baliogabezko kredentzialtzat hartuko ditu, beste erantzunak kredentzial egokitzat hartuko dituelarik."
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 80b891d17b2c1ba015e30f665ddd01e2f6652fb6..b14c7903db5c880443fc19141f568b805a866334 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Hossein nag <h.sname@yahoo.com>, 2012.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,33 +19,33 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Ú©Ø§Ø±Ø¨Ø± %s  ÛŒÚ© Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø§Ø³Øª."
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Ú©Ø§Ø±Ø¨Ø± %s  ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø§Ø³Øª."
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "Ú©Ø§Ø±Ø¨Ø± %s Ù¾Ø±ÙˆÙ†Ø¯Ù‡ \"%s\" Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø§Ø³Øª. Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø§ÛŒÙ†Ø¬Ø§Ø³Øª : %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "Ú©Ø§Ø±Ø¨Ø± %s Ù¾ÙˆØ´Ù‡ \"%s\" Ø±Ø§ Ø¨Ø§ Ø´Ù…Ø§ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø§Ø³Øª. Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¨Ø±Ø§ÛŒ Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø§ÛŒÙ†Ø¬Ø§Ø³Øª : %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr ""
+msgstr "Ù†ÙˆØ¹ Ø¯Ø³ØªÙ‡ Ø¨Ù†Ø¯ÛŒ Ø§Ø±Ø§Ø¦Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -58,18 +59,18 @@ msgstr "Ø§ÛŒÙ† Ú¯Ø±ÙˆÙ‡ Ø§Ø² Ù‚Ø¨Ù„ Ø§Ø¶Ø§ÙÙ‡ Ø´Ø¯Ù‡"
 #: ajax/vcategories/favorites.php:24
 #: ajax/vcategories/removeFromFavorites.php:26
 msgid "Object type not provided."
-msgstr ""
+msgstr "Ù†ÙˆØ¹ Ø´ÛŒ Ø§Ø±Ø§Ø¦Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "Ø´Ù†Ø§Ø³Ù‡ %s  Ø§Ø±Ø§Ø¦Ù‡ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Ø®Ø·Ø§ÛŒ Ø§Ø¶Ø§ÙÙ‡ Ú©Ø±Ø¯Ù† %s  Ø¨Ù‡ Ø¹Ù„Ø§Ù‚Ù‡ Ù…Ù†Ø¯ÛŒ Ù‡Ø§."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -78,67 +79,143 @@ msgstr "Ù‡ÛŒØ¬ Ø¯Ø³ØªÙ‡ Ø§ÛŒ Ø¨Ø±Ø§ÛŒ Ù¾Ø§Ú© Ø´Ø¯Ù† Ø§Ù†ØªØ®Ø§Ø¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Ø®Ø·Ø§ÛŒ Ù¾Ø§Ú© Ú©Ø±Ø¯Ù† %s Ø§Ø² Ø¹Ù„Ø§Ù‚Ù‡ Ù…Ù†Ø¯ÛŒ Ù‡Ø§."
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr "ÛŒÚ©Ø´Ù†Ø¨Ù‡"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Ø¯ÙˆØ´Ù†Ø¨Ù‡"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Ø³Ù‡ Ø´Ù†Ø¨Ù‡"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Ú†Ù‡Ø§Ø±Ø´Ù†Ø¨Ù‡"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ù¾Ù†Ø¬Ø´Ù†Ø¨Ù‡"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Ø¬Ù…Ø¹Ù‡"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Ø´Ù†Ø¨Ù‡"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Ú˜Ø§Ù†ÙˆÛŒÙ‡"
+
+#: js/config.php:33
+msgid "February"
+msgstr "ÙØ¨Ø±ÛŒÙ‡"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Ù…Ø§Ø±Ø³"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Ø¢ÙˆØ±ÛŒÙ„"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Ù…ÛŒ"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:33
+msgid "June"
+msgstr "Ú˜ÙˆØ¦Ù†"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Ø¬ÙˆÙ„Ø§ÛŒ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Ø¢Ú¯ÙˆØ³Øª"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Ø³Ù¾ØªØ§Ù…Ø¨Ø±"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Ø§Ú©ØªØ¨Ø±"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Ù†ÙˆØ§Ù…Ø¨Ø±"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Ø¯Ø³Ø§Ù…Ø¨Ø±"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§} Ø¯Ù‚ÛŒÙ‚Ù‡ Ù‡Ø§ÛŒ Ù¾ÛŒØ´"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{Ø³Ø§Ø¹Øª Ù‡Ø§} Ø³Ø§Ø¹Øª Ù‡Ø§ Ù¾ÛŒØ´"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Ø§Ù…Ø±ÙˆØ²"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ø¯ÛŒØ±ÙˆØ²"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
-msgstr ""
+msgstr "{Ø±ÙˆØ²Ù‡Ø§} Ø±ÙˆØ²Ù‡Ø§ÛŒ Ù¾ÛŒØ´"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ù…Ø§Ù‡ Ù‚Ø¨Ù„"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
-msgstr ""
+msgstr "{Ù…Ø§Ù‡ Ù‡Ø§} Ù…Ø§Ù‡ Ù‡Ø§ Ù¾ÛŒØ´"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Ù…Ø§Ù‡â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ø³Ø§Ù„ Ù‚Ø¨Ù„"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„"
 
 #: js/oc-dialogs.js:126
 msgid "Choose"
-msgstr ""
+msgstr "Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ø±Ø¯Ù†"
 
 #: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
@@ -159,139 +236,157 @@ msgstr "Ù‚Ø¨ÙˆÙ„"
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
-msgstr ""
+msgstr "Ù†ÙˆØ¹ Ø´ÛŒ ØªØ¹ÛŒÛŒÙ† Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Ø®Ø·Ø§"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "Ù†Ø§Ù… Ø¨Ø±Ù†Ø§Ù…Ù‡ ØªØ¹ÛŒÛŒÙ† Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ { Ù¾Ø±ÙˆÙ†Ø¯Ù‡} Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø´Ø¯Ù‡ Ù†ØµØ¨ Ù†Ø´Ø¯Ù‡ Ø§Ø³Øª !"
+
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Share"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
-msgid "Error while sharing"
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Shared"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:141 js/share.js:611
+msgid "Error while sharing"
+msgstr "Ø®Ø·Ø§ Ø¯Ø±ØØ§Ù„ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ†"
+
+#: js/share.js:152
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø±ØØ§Ù„ Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø± ØØ§Ù„ ØªØºÛŒÛŒØ± Ù…Ø¬ÙˆØ²"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§ Ø´Ù…Ø§ Ùˆ Ú¯Ø±ÙˆÙ‡ {Ú¯Ø±ÙˆÙ‡} ØªÙˆØ³Ø· {Ø¯Ø§Ø±Ù†Ø¯Ù‡}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¨Ø§ Ø´Ù…Ø§ ØªÙˆØ³Ø· { Ø¯Ø§Ø±Ù†Ø¯Ù‡}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø§"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ† Ø¨Ø§ Ù¾ÛŒÙˆÙ†Ø¯"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
-msgstr ""
+msgstr "Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ú©Ø±Ø¯Ù† Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
-msgstr ""
+msgstr "Ù¾ÛŒÙˆÙ†Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ø±Ø§ÛŒ Ø´Ø®Øµ."
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ… ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
-msgstr ""
+msgstr "ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
-msgstr ""
+msgstr "Ø§Ø² Ø·Ø±ÛŒÙ‚ Ø§ÛŒÙ…ÛŒÙ„ Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ø¨Ú¯Ø°Ø§Ø±ÛŒØ¯ :"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
-msgstr ""
+msgstr "Ú©Ø³ÛŒ ÛŒØ§ÙØª Ù†Ø´Ø¯"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø±ÛŒ Ù…Ø¬Ø¯Ø¯ Ù…Ø¬Ø§Ø² Ù†Ù…ÛŒ Ø¨Ø§Ø´Ø¯"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ Ø¯Ø± {Ø¨Ø®Ø´} Ø¨Ø§ {Ú©Ø§Ø±Ø¨Ø±}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
-msgstr ""
+msgstr "Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
-msgstr ""
+msgstr "Ù…ÛŒ ØªÙˆØ§Ù† ÙˆÛŒØ±Ø§ÛŒØ´ Ú©Ø±Ø¯"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
-msgstr ""
+msgstr "Ú©Ù†ØªØ±Ù„ Ø¯Ø³ØªØ±Ø³ÛŒ"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "Ø§ÛŒØ¬Ø§Ø¯"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø±ÙˆØ²"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
-msgstr ""
+msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
-msgstr ""
+msgstr "Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ†"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
-msgstr ""
+msgstr "Ù†Ú¯Ù‡Ø¯Ø§Ø±ÛŒ Ø§Ø² Ø±Ù…Ø² Ø¹Ø¨ÙˆØ±"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ… Ù†Ú©Ø±Ø¯Ù† ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§ "
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø± ØªÙ†Ø¸ÛŒÙ… ØªØ§Ø±ÛŒØ® Ø§Ù†Ù‚Ø¶Ø§"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "Ù¾Ø³ÙˆØ±Ø¯ Ø§Ø¨Ø±Ù‡Ø§ÛŒ Ø´Ù…Ø§ ØªØºÛŒÛŒØ±Ú©Ø±Ø¯"
@@ -306,11 +401,11 @@ msgstr "Ø´Ù…Ø§ ÛŒÚ© Ù†Ø§Ù…Ù‡ Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ ØØ§ÙˆÛŒ ÛŒÚ© Ù„ÛŒÙ†Ú© Ø¬Ù‡Øª
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "ØªÙ†Ø¸ÛŒÙ… Ù…Ø¬Ø¯Ø¯ Ø§ÛŒÙ…ÛŒÙ„ Ø±Ø§ Ø¨ÙØ±Ø³ØªÛŒØ¯."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "Ø¯Ø±Ø®ÙˆØ§Ø³Øª Ø±Ø¯ Ø´Ø¯Ù‡ Ø§Ø³Øª !"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
 #: templates/login.php:28
@@ -381,7 +476,7 @@ msgstr "Ø§Ø®Ø·Ø§Ø± Ø§Ù…Ù†ÛŒØªÛŒ"
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Ù‡ÛŒÚ† Ù…ÙˆÙ„Ø¯ ØªØµØ§Ø¯ÙÛŒ Ø§Ù…Ù† Ø¯Ø± Ø¯Ø³ØªØ±Ø³ Ù†ÛŒØ³ØªØŒ Ù„Ø·ÙØ§ ÙØ±Ù…Øª PHP OpenSSL Ø±Ø§ ÙØ¹Ø§Ù„ Ù†Ù…Ø§ÛŒÛŒØ¯."
 
 #: templates/installation.php:26
 msgid ""
@@ -433,7 +528,7 @@ msgstr "Ù†Ø§Ù… Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
 #: templates/installation.php:123
 msgid "Database tablespace"
-msgstr ""
+msgstr "Ø¬Ø¯ÙˆÙ„ Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 
 #: templates/installation.php:129
 msgid "Database host"
@@ -443,103 +538,27 @@ msgstr "Ù‡Ø§Ø³Øª Ù¾Ø§ÛŒÚ¯Ø§Ù‡ Ø¯Ø§Ø¯Ù‡"
 msgid "Finish setup"
 msgstr "Ø§ØªÙ…Ø§Ù… Ù†ØµØ¨"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "ÛŒÚ©Ø´Ù†Ø¨Ù‡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Ø¯ÙˆØ´Ù†Ø¨Ù‡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Ø³Ù‡ Ø´Ù†Ø¨Ù‡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Ú†Ù‡Ø§Ø±Ø´Ù†Ø¨Ù‡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Ù¾Ù†Ø¬Ø´Ù†Ø¨Ù‡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Ø¬Ù…Ø¹Ù‡"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Ø´Ù†Ø¨Ù‡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Ú˜Ø§Ù†ÙˆÛŒÙ‡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "ÙØ¨Ø±ÛŒÙ‡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Ù…Ø§Ø±Ø³"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Ø¢ÙˆØ±ÛŒÙ„"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Ù…ÛŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Ú˜ÙˆØ¦Ù†"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Ø¬ÙˆÙ„Ø§ÛŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Ø¢Ú¯ÙˆØ³Øª"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Ø³Ù¾ØªØ§Ù…Ø¨Ø±"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Ø§Ú©ØªØ¨Ø±"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Ù†ÙˆØ§Ù…Ø¨Ø±"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Ø¯Ø³Ø§Ù…Ø¨Ø±"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Ø³Ø±ÙˆÛŒØ³ ÙˆØ¨ ØªØØª Ú©Ù†ØªØ±Ù„ Ø´Ù…Ø§"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Ø®Ø±ÙˆØ¬"
 
 #: templates/login.php:10
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "ÙˆØ±ÙˆØ¯ Ø¨Ù‡ Ø³ÛŒØ³ØªÙ… Ø§ØªÙˆÙ…Ø§ØªÛŒÚ© Ø±Ø¯Ø´Ø¯!"
 
 #: templates/login.php:11
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Ø§Ú¯Ø± Ø´Ù…Ø§ Ø§Ø®ÛŒØ±Ø§ Ø±Ù…Ø²Ø¹Ø¨ÙˆØ± Ø±Ø§ ØªØºÛŒÛŒØ± Ù†Ø¯Ø§Ø¯Ù‡ Ø§ÛŒØ¯ØŒ ØØ³Ø§Ø¨ Ø´Ù…Ø§ Ø¯Ø± Ù…Ø¹Ø±Ø¶ Ø®Ø·Ø± Ù…ÛŒ Ø¨Ø§Ø´Ø¯ !"
 
 #: templates/login.php:13
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Ù„Ø·ÙØ§ Ø±Ù…Ø² Ø¹Ø¨ÙˆØ± Ø®ÙˆØ¯ Ø±Ø§ ØªØºÛŒÛŒØ± Ø¯Ù‡ÛŒØ¯ ØªØ§ Ù…Ø¬Ø¯Ø¯Ø§ ØØ³Ø§Ø¨ Ø´Ù…Ø§  Ø¯Ø± Ø§Ù…Ø§Ù† Ø¨Ø§Ø´Ø¯."
 
 #: templates/login.php:19
 msgid "Lost your password?"
@@ -565,17 +584,3 @@ msgstr "Ø¨Ø¹Ø¯ÛŒ"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index ea5bfc082a3abc6f47cf0c2b8071683c585f406f..b153a65abbf2ce622a15b507bb32ceba30d079d4 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Hossein nag <h.sname@yahoo.com>, 2012.
+# mahdi Kereshteh <miki_mika1362@yahoo.com>, 2013.
 # Mohammad Dashtizadeh <mohammad@dashtizadeh.net>, 2012.
 # vahid chakoshy <vchakoshy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -23,69 +24,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ ØØ±Ú©Øª Ú©Ù†Ø¯ - Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¨Ø§ Ø§ÛŒÙ† Ù†Ø§Ù… ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯. "
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "%s Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ ØØ±Ú©Øª Ú©Ù†Ø¯ "
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Ù‚Ø§Ø¯Ø± Ø¨Ù‡ ØªØºÛŒÛŒØ± Ù†Ø§Ù… Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù†ÛŒØ³Øª."
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Ù‡ÛŒÚ† ÙØ§ÛŒÙ„ÛŒ Ø¢Ù¾Ù„ÙˆØ¯ Ù†Ø´Ø¯.Ø®Ø·Ø§ÛŒ Ù†Ø§Ø´Ù†Ø§Ø³"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Ù‡ÛŒÚ† Ø®Ø·Ø§ÛŒÛŒ ÙˆØ¬ÙˆØ¯ Ù†Ø¯Ø§Ø±Ø¯ ÙØ§ÛŒÙ„ Ø¨Ø§ Ù…ÙˆÙÙ‚ÛŒØª Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¢Ù¾Ù„ÙˆØ¯ Ø´Ø¯Ù‡ Ø¨ÛŒØ´ Ø§Ø²Ø¯Ø³ØªÙˆØ±  Ù…Ø§Ú©Ø²ÛŒÙ…Ù…_ØØ¬Ù… ÙØ§ÛŒÙ„_Ø¨Ø±Ø§ÛŒ Ø¢Ù¾Ù„ÙˆØ¯ Ø¯Ø±   php.ini Ø§Ø³ØªÙØ§Ø¯Ù‡ Ú©Ø±Ø¯Ù‡ Ø§Ø³Øª."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ØØ¯Ø§Ú©Ø«Ø± ØØ¬Ù… Ù…Ø¬Ø§Ø² Ø¨Ø±Ø§ÛŒ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø§Ø² Ø·Ø±ÛŒÙ‚ HTML \nMAX_FILE_SIZE"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ù…Ù‚Ø¯Ø§Ø± Ú©Ù…ÛŒ Ø§Ø² ÙØ§ÛŒÙ„ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø´Ø¯Ù‡"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ù‡ÛŒÚ† ÙØ§ÛŒÙ„ÛŒ Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ù†Ø´Ø¯Ù‡"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ù…ÙˆÙ‚Øª Ú¯Ù… Ø´Ø¯Ù‡ Ø§Ø³Øª"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Ù†ÙˆØ´ØªÙ† Ø¨Ø± Ø±ÙˆÛŒ Ø¯ÛŒØ³Ú© Ø³Ø®Øª Ù†Ø§Ù…ÙˆÙÙ‚ Ø¨ÙˆØ¯"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "ÙÙ‡Ø±Ø³Øª Ø±Ø§Ù‡Ù†Ù…Ø§ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ù…ÛŒ Ø¨Ø§Ø´Ø¯."
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "ÙØ§ÛŒÙ„ Ù‡Ø§"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
-msgstr ""
+msgstr "Ù„ØºÙˆ Ø§Ø´ØªØ±Ø§Ú©"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†"
 
@@ -93,136 +94,150 @@ msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†"
 msgid "Rename"
 msgstr "ØªØºÛŒÛŒØ±Ù†Ø§Ù…"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{Ù†Ø§Ù… _Ø¬Ø¯ÛŒØ¯} Ø¯Ø± ØØ§Ù„ ØØ§Ø¶Ø± ÙˆØ¬ÙˆØ¯ Ø¯Ø§Ø±Ø¯."
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ†"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
-msgstr ""
+msgstr "Ù¾ÛŒØ´Ù†Ù‡Ø§Ø¯ Ù†Ø§Ù…"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Ù„ØºÙˆ"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
-msgstr ""
+msgstr "{Ù†Ø§Ù… _Ø¬Ø¯ÛŒØ¯} Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø´Ø¯ "
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Ø¨Ø§Ø²Ú¯Ø´Øª"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "{Ù†Ø§Ù…_Ø¬Ø¯ÛŒØ¯} Ø¨Ø§ { Ù†Ø§Ù…_Ù‚Ø¯ÛŒÙ…ÛŒ} Ø¬Ø§ÛŒÚ¯Ø²ÛŒÙ† Ø´Ø¯."
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
-msgstr ""
+msgstr "{ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ } Ù‚Ø³Ù…Øª Ù†Ø´Ø¯Ù‡"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
-msgstr ""
+msgstr "{ ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ } Ù¾Ø§Ú© Ø´Ø¯Ù‡"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.'   ÛŒÚ© Ù†Ø§Ù… Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Ù†Ø§Ù… Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯."
 
-#: js/files.js:45
+#: 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:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Ø¯Ø± ØØ§Ù„ Ø³Ø§Ø®Øª ÙØ§ÛŒÙ„ ÙØ´Ø±Ø¯Ù‡ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ø²Ù…Ø§Ù† Ø²ÛŒØ§Ø¯ÛŒ Ø¨Ù‡ Ø·ÙˆÙ„ Ø¨ÛŒØ§Ù†Ø¬Ø§Ù…Ø¯"
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "Ø¯Ø§Ù†Ù„ÙˆØ¯ Ø´Ù…Ø§ Ø¯Ø± ØØ§Ù„ Ø¢Ù…Ø§Ø¯Ù‡ Ø´Ø¯Ù† Ø§Ø³Øª. Ø¯Ø± ØµÙˆØ±ØªÛŒÚ©Ù‡ Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§ Ø¨Ø²Ø±Ú¯ Ø¨Ø§Ø´Ù†Ø¯ Ù…Ù…Ú©Ù† Ø§Ø³Øª Ù…Ø¯ØªÛŒ Ø·ÙˆÙ„ Ø¨Ú©Ø´Ø¯."
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ù†Ø§ØªÙˆØ§Ù† Ø¯Ø± Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ ÛŒØ§ ÙØ§ÛŒÙ„ ÛŒÚ© Ù¾ÙˆØ´Ù‡ Ø§Ø³Øª ÛŒØ§ 0Ø¨Ø§ÛŒØª Ø¯Ø§Ø±Ø¯"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Ø¨Ø³ØªÙ†"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Ø¯Ø± Ø§Ù†ØªØ¸Ø§Ø±"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
-msgstr ""
+msgstr "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¢Ù¾Ù„ÙˆØ¯ Ø´Ø¯."
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
-msgstr ""
+msgstr "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø¯Ø± ØØ§Ù„ Ø¢Ù¾Ù„ÙˆØ¯"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ Ù„ØºÙˆ Ø´Ø¯"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Ø¢Ù¾Ù„ÙˆØ¯Ú©Ø±Ø¯Ù† Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ø¯Ø± ØØ§Ù„ Ù¾ÛŒØ´Ø±ÙØª Ø§Ø³Øª. Ø¯Ø± ØµÙˆØ±Øª Ø®Ø±ÙˆØ¬ Ø§Ø² ØµÙØÙ‡ Ø¢Ù¾Ù„ÙˆØ¯ Ù„ØºÙˆ Ù…ÛŒÚ¯Ø±Ø¯Ø¯. "
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
-msgstr ""
+msgstr "URL  Ù†Ù…ÛŒ ØªÙˆØ§Ù†Ø¯ Ø®Ø§Ù„ÛŒ Ø¨Ø§Ø´Ø¯."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ù†Ø§Ù… Ù¾ÙˆØ´Ù‡ Ù†Ø§Ù…Ø¹ØªØ¨Ø± Ø§Ø³Øª. Ø§Ø³ØªÙØ§Ø¯Ù‡ Ø§Ø² \" Ø¨Ù‡ Ø§Ø´ØªØ±Ø§Ú© Ú¯Ø°Ø§Ø´ØªÙ‡ Ø´Ø¯Ù‡ \" Ù…ØªØ¹Ù„Ù‚ Ø¨Ù‡ Ø³Ø§ÛŒØª Owncloud Ø§Ø³Øª."
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
-msgstr ""
+msgstr "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø§Ø³Ú©Ù† Ø´Ø¯Ù‡"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
-msgstr ""
+msgstr "Ø®Ø·Ø§ Ø¯Ø± ØØ§Ù„ Ø§Ù†Ø¬Ø§Ù… Ø§Ø³Ú©Ù† "
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ù†Ø§Ù…"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Ø§Ù†Ø¯Ø§Ø²Ù‡"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ØªØºÛŒÛŒØ± ÛŒØ§ÙØªÙ‡"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
-msgstr ""
+msgstr "1 Ù¾ÙˆØ´Ù‡"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
-msgstr ""
+msgstr "{ Ø´Ù…Ø§Ø±} Ù¾ÙˆØ´Ù‡ Ù‡Ø§"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
-msgstr ""
+msgstr "1 Ù¾Ø±ÙˆÙ†Ø¯Ù‡"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
-msgstr ""
+msgstr "{ Ø´Ù…Ø§Ø± } ÙØ§ÛŒÙ„ Ù‡Ø§"
+
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -270,38 +285,34 @@ msgstr "Ù¾ÙˆØ´Ù‡"
 
 #: templates/index.php:14
 msgid "From link"
-msgstr ""
-
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ"
+msgstr "Ø§Ø² Ù¾ÛŒÙˆÙ†Ø¯"
 
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Ù…ØªÙˆÙ‚Ù Ú©Ø±Ø¯Ù† Ø¨Ø§Ø± Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ø§ÛŒÙ†Ø¬Ø§ Ù‡ÛŒÚ† Ú†ÛŒØ² Ù†ÛŒØ³Øª."
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Ø¨Ø§Ø±Ú¯ÛŒØ±ÛŒ"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "ØØ¬Ù… Ø¨Ø§Ø±Ú¯Ø°Ø§Ø±ÛŒ Ø¨Ø³ÛŒØ§Ø± Ø²ÛŒØ§Ø¯ Ø§Ø³Øª"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Ù¾Ø±ÙˆÙ†Ø¯Ù‡ Ù‡Ø§ Ø¯Ø± ØØ§Ù„ Ø¨Ø§Ø²Ø±Ø³ÛŒ Ù‡Ø³ØªÙ†Ø¯ Ù„Ø·ÙØ§ ØµØ¨Ø± Ú©Ù†ÛŒØ¯"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Ø¨Ø§Ø²Ø±Ø³ÛŒ Ú©Ù†ÙˆÙ†ÛŒ"
diff --git a/l10n/fa/files_encryption.po b/l10n/fa/files_encryption.po
index 74f153d436e403f7f17a5da2a5cbb2d5034d438d..b5ac04c90a91d64b94b7543fbab1b024841ddf1f 100644
--- a/l10n/fa/files_encryption.po
+++ b/l10n/fa/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-15 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 08:31+0000\n"
-"Last-Translator: basir <basir.jafarzadeh@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
@@ -19,18 +19,66 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ù†Ø§Ø¯ÛŒØ¯Ù‡ Ú¯Ø±ÙØªÙ† ÙØ§ÛŒÙ„ Ù‡Ø§ÛŒ Ø²ÛŒØ± Ø¨Ø±Ø§ÛŒ Ø±Ù…Ø² Ú¯Ø°Ø§Ø±ÛŒ"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ù‡ÛŒÚ†â€ŒÚ©Ø¯Ø§Ù…"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "ÙØ¹Ø§Ù„ Ú©Ø±Ø¯Ù† Ø±Ù…Ø²Ú¯Ø°Ø§Ø±ÛŒ"
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index b7da17a8178a014253021b75b1c73a386accd279..7e657a47ca64b2d806d2c02ed39144d6f1c30177 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/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: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-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"
 "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,22 +18,10 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Ø§Ù†Ù‚Ø¶Ø§ÛŒ ØªÙ…Ø§Ù…ÛŒ Ù†Ø³Ø®Ù‡â€ŒÙ‡Ø§"
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 44408cc66f79f752cf5ad993cbcfc529c163425f..7cceb3e4f3a0c61114580e83a636de68d6b5e01a 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 13:36+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"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Ø±Ø§Ù‡â€ŒÙ†Ù…Ø§"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Ø´Ø®ØµÛŒ"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "ØªÙ†Ø¸ÛŒÙ…Ø§Øª"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Ú©Ø§Ø±Ø¨Ø±Ø§Ù†"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Ù…Ø¯ÛŒØ±"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Ø®Ø·Ø§ Ø¯Ø± Ø§Ø¹ØªØ¨Ø§Ø± Ø³Ù†Ø¬ÛŒ"
 
@@ -82,55 +86,55 @@ msgstr "Ù…ØªÙ†"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Ø§Ù…Ø±ÙˆØ²"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ø¯ÛŒØ±ÙˆØ²"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ù…Ø§Ù‡ Ù‚Ø¨Ù„"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ø³Ø§Ù„ Ù‚Ø¨Ù„"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ø³Ø§Ù„â€ŒÙ‡Ø§ÛŒ Ù‚Ø¨Ù„"
 
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 20aa22599b1e5e1226bad3d5c24a4aa26a6811d6..05c650563079260c3f9b263c073762dd287dc7a3 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "ÙØ¹Ø§Ù„"
 msgid "Saving..."
 msgstr "Ø¯Ø±ØØ§Ù„ Ø°Ø®ÛŒØ±Ù‡ ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -103,15 +103,15 @@ msgstr "Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø®ÙˆØ¯ Ø±Ø§ Ø¨ÛŒØ§ÙØ²Ø§ÛŒÛŒØ¯"
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "ÛŒÚ© Ø¨Ø±Ù†Ø§Ù…Ù‡ Ø§Ù†ØªØ®Ø§Ø¨ Ú©Ù†ÛŒØ¯"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "ØµÙØÙ‡ Ø§ÛŒÙ† Ø§ÙŒÙ¾ Ø±Ø§ Ø¯Ø± apps.owncloud.com Ø¨Ø¨ÛŒÙ†ÛŒØ¯"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡"
 
@@ -230,11 +230,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ù†Ø§Ù…"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Ú¯Ø±ÙˆÙ‡ Ù‡Ø§"
 
@@ -246,26 +246,30 @@ msgstr "Ø§ÛŒØ¬Ø§Ø¯ Ú©Ø±Ø¯Ù†"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Ø³Ø§ÛŒØ±"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Ù¾Ø§Ú© Ú©Ø±Ø¯Ù†"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index f7e8c607e271be8b2d4f90100befdf6157f43caa..b9a2a1475466d58a64ad5f842420cb74e151d2a4 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/fa/user_webdavauth.po b/l10n/fa/user_webdavauth.po
index 2987a7b6bdb8c2ce7b19c6c85700825f8f16d450..e4088da32dd6c3c42af2336a690dd7e4b994bd7e 100644
--- a/l10n/fa/user_webdavauth.po
+++ b/l10n/fa/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: fa\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index cdcdcda1522e1ed723cc035f01d8f8f2597c8ef6..74a6747f32b6bf8d291b3bf3260e52a39fab7cd7 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.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-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 16:33+0000\n"
-"Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,24 +24,24 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "KÃ¤yttÃ¤jÃ¤ %s jakoi tiedoston kanssasi"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "KÃ¤yttÃ¤jÃ¤ %s jakoi kansion kanssasi"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "KÃ¤yttÃ¤jÃ¤ %s jakoi tiedoston \"%s\" kanssasi. Se on ladattavissa tÃ¤Ã¤ltÃ¤: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -75,7 +75,7 @@ msgstr ""
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Virhe lisÃ¤tessÃ¤ kohdetta %s suosikkeihin."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -84,61 +84,137 @@ msgstr "Luokkia ei valittu poistettavaksi."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Virhe poistaessa kohdetta %s suosikeista."
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Maanantai"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Torstai"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Friday"
+msgstr "Perjantai"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Lauantai"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Tammikuu"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Helmikuu"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Maaliskuu"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Huhtikuu"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Toukokuu"
+
+#: js/config.php:33
+msgid "June"
+msgstr "KesÃ¤kuu"
+
+#: js/config.php:33
+msgid "July"
+msgstr "HeinÃ¤kuu"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Elokuu"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Syyskuu"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Lokakuu"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Marraskuu"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Joulukuu"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuuttia sitten"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} tuntia sitten"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "tÃ¤nÃ¤Ã¤n"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} pÃ¤ivÃ¤Ã¤ sitten"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} kuukautta sitten"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "vuotta sitten"
 
@@ -168,8 +244,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Virhe"
 
@@ -181,123 +257,141 @@ msgstr "Sovelluksen nimeÃ¤ ei ole mÃ¤Ã¤ritelty."
 msgid "The required file {file} is not installed!"
 msgstr "Vaadittua tiedostoa {file} ei ole asennettu!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Virhe jakoa peruttaessa"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Virhe oikeuksia muuttaessa"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Jaettu sinun ja ryhmÃ¤n {group} kanssa kÃ¤yttÃ¤jÃ¤n {owner} toimesta"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Jaettu kanssasi kÃ¤yttÃ¤jÃ¤n {owner} toimesta"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
-msgstr ""
+msgstr "Jaa"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Jaa linkillÃ¤"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Salasana"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "LÃ¤hetÃ¤ linkki sÃ¤hkÃ¶postitse"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "LÃ¤hetÃ¤"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Aseta pÃ¤Ã¤ttymispÃ¤ivÃ¤"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "PÃ¤Ã¤ttymispÃ¤ivÃ¤"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Jaa sÃ¤hkÃ¶postilla:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "HenkilÃ¶itÃ¤ ei lÃ¶ytynyt"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "voi muokata"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "PÃ¤Ã¤syn hallinta"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "luo"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "pÃ¤ivitÃ¤"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "poista"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa erÃ¤pÃ¤ivÃ¤Ã¤"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Virhe pÃ¤Ã¤ttymispÃ¤ivÃ¤Ã¤ asettaessa"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "LÃ¤hetetÃ¤Ã¤n..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "SÃ¤hkÃ¶posti lÃ¤hetetty"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud-salasanan nollaus"
@@ -449,87 +543,11 @@ msgstr "Tietokantapalvelin"
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Sunnuntai"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Maanantai"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Tiistai"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Keskiviikko"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Torstai"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Perjantai"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Lauantai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Tammikuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Helmikuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Maaliskuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Huhtikuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Toukokuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "KesÃ¤kuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "HeinÃ¤kuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Elokuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Syyskuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Lokakuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Marraskuu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Joulukuu"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
@@ -571,17 +589,3 @@ msgstr "seuraava"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "PÃ¤ivitetÃ¤Ã¤n ownCloud versioon %s, tÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Turvallisuusvaroitus!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Vahvista salasanasi. <br/>TurvallisuussyistÃ¤ sinulta saatetaan ajoittain kysyÃ¤ salasanasi uudelleen."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Vahvista"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index cf08585d92b37cad98f477749f4a62b469f92a6f..16c19a658afee698a270a974550d07f18fa9ee68 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-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 19:12+0000\n"
+"POT-Creation-Date: 2013-01-29 00:04+0100\n"
+"PO-Revision-Date: 2013-01-28 18:44+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"
@@ -36,46 +36,46 @@ msgstr "Kohteen %s siirto ei onnistunut"
 msgid "Unable to rename file"
 msgstr "Tiedoston nimeÃ¤minen uudelleen ei onnistunut"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiedostoa ei lÃ¤hetetty. Tuntematon virhe"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Ei virheitÃ¤, tiedosto lÃ¤hetettiin onnistuneesti"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "LÃ¤hetetty tiedosto ylittÃ¤Ã¤ HTML-lomakkeessa mÃ¤Ã¤ritetyn MAX_FILE_SIZE-arvon ylÃ¤rajan"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Tiedoston lÃ¤hetys onnistui vain osittain"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "YhtÃ¤kÃ¤Ã¤n tiedostoa ei lÃ¤hetetty"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "VÃ¤liaikaiskansiota ei ole olemassa"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Levylle kirjoitus epÃ¤onnistui"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Tilaa ei ole riittÃ¤vÃ¤sti"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Tallennustilaa ei ole riittÃ¤vÃ¤sti kÃ¤ytettÃ¤vissÃ¤"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Virheellinen kansio."
 
@@ -83,11 +83,11 @@ msgstr "Virheellinen kansio."
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Poista"
 
@@ -95,137 +95,151 @@ msgstr "Poista"
 msgid "Rename"
 msgstr "NimeÃ¤ uudelleen"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} on jo olemassa"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "ehdota nimeÃ¤"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' on virheellinen nimi tiedostolle."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Tiedoston nimi ei voi olla tyhjÃ¤."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivÃ¤t ole sallittuja."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "luodaan ZIP-tiedostoa, tÃ¤mÃ¤ saattaa kestÃ¤Ã¤ hetken."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Tallennustila on loppu, tiedostoja ei voi enÃ¤Ã¤ pÃ¤ivittÃ¤Ã¤ tai synkronoida!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Tallennustila on melkein loppu ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "LÃ¤hetysvirhe."
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Sulje"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "LÃ¤hetys peruttu."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Verkko-osoite ei voi olla tyhjÃ¤"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nimi"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Muutettu"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 kansio"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} kansiota"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 tiedosto"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} tiedostoa"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "LÃ¤hetÃ¤"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Tiedostonhallinta"
@@ -274,36 +288,32 @@ msgstr "Kansio"
 msgid "From link"
 msgstr "LinkistÃ¤"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "LÃ¤hetÃ¤"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Peru lÃ¤hetys"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "TÃ¤Ã¤llÃ¤ ei ole mitÃ¤Ã¤n. LÃ¤hetÃ¤ tÃ¤nne jotakin!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "LÃ¤hetettÃ¤vÃ¤ tiedosto on liian suuri"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "TÃ¤mÃ¤nhetkinen tutkinta"
diff --git a/l10n/fi_FI/files_encryption.po b/l10n/fi_FI/files_encryption.po
index 89ad916e38220eadda3dc8ee271c78256ab0672e..5f635937590854d7c8db895b44a1b69e95421684 100644
--- a/l10n/fi_FI/files_encryption.po
+++ b/l10n/fi_FI/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-17 00:44+0200\n"
-"PO-Revision-Date: 2012-08-16 10:56+0000\n"
-"Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi_FI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Salaus"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "JÃ¤tÃ¤ seuraavat tiedostotyypit salaamatta"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ei mitÃ¤Ã¤n"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "KÃ¤ytÃ¤ salausta"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index ab692d6056c3a262608ab72a00e3b82b08351e0f..4a04a540a9089dcab78a062d7a3829e5708e968d 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: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 12:22+0000\n"
-"Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Vanhenna kaikki versiot"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historia"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versiot"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "TÃ¤mÃ¤ poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Tiedostojen versiointi"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 0669c281cf6bd7d4d5b5e6856b594e1fe59f71b3..7b90f23c2cd82bc41a1a606157c98ca8424fe1ff 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>, 2012.
+# Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 20:58+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 08:40+0000\n"
 "Last-Translator: Jiri GrÃ¶nroos <jiri.gronroos@iki.fi>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Ohje"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "HenkilÃ¶kohtainen"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Asetukset"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "KÃ¤yttÃ¤jÃ¤t"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Sovellukset"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "YllÃ¤pitÃ¤jÃ¤"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu kÃ¤ytÃ¶stÃ¤."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittÃ¤in."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "ei voitu mÃ¤Ã¤rittÃ¤Ã¤"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Sovellusta ei ole otettu kÃ¤yttÃ¶Ã¶n"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Todennusvirhe"
 
@@ -82,55 +86,55 @@ msgstr "Teksti"
 msgid "Images"
 msgstr "Kuvat"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuuttia sitten"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d tuntia sitten"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "tÃ¤nÃ¤Ã¤n"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "eilen"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d pÃ¤ivÃ¤Ã¤ sitten"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "viime kuussa"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d kuukautta sitten"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "viime vuonna"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "vuotta sitten"
 
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 087d613c68548b1dc5d631f85b7511c48858ca9f..c662e178989c2b1ff972f459ca2277021a1efb0b 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "KÃ¤ytÃ¤"
 msgid "Saving..."
 msgstr "Tallennetaan..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "_kielen_nimi_"
 
@@ -102,15 +102,15 @@ msgstr "LisÃ¤Ã¤ sovelluksesi"
 msgid "More Apps"
 msgstr "LisÃ¤Ã¤ sovelluksia"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Valitse sovellus"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>"
 
@@ -159,7 +159,7 @@ msgstr "Lataa Android-sovellus"
 msgid "Download iOS Client"
 msgstr "Lataa iOS-sovellus"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Salasana"
 
@@ -229,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nimi"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "RyhmÃ¤t"
 
@@ -245,26 +245,30 @@ msgstr "Luo"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Rajoittamaton"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Muu"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "RyhmÃ¤n yllÃ¤pitÃ¤jÃ¤"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Oletus"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Poista"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 6f821f095c12f71ed8d2dc18c47e2e3d8032c041..94f7ad7b4bbe073614304c490538f1213fe6706c 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -29,8 +29,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -46,6 +46,10 @@ msgstr "Voit jÃ¤ttÃ¤Ã¤ protokollan mÃ¤Ã¤rittÃ¤mÃ¤ttÃ¤, paitsi kun vaadit SSL:Ã¤
 msgid "Base DN"
 msgstr "Oletus DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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Ã¤  "
@@ -117,10 +121,18 @@ msgstr "Portti"
 msgid "Base User Tree"
 msgstr "OletuskÃ¤yttÃ¤jÃ¤puu"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Ryhmien juuri"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "RyhmÃ¤n ja jÃ¤senen assosiaatio (yhteys)"
diff --git a/l10n/fi_FI/user_webdavauth.po b/l10n/fi_FI/user_webdavauth.po
index 1bf07546c14529476f91651a5ebb8418547ea042..c42c6d288e6cca996ddb82eba6a0f920ed878cdc 100644
--- a/l10n/fi_FI/user_webdavauth.po
+++ b/l10n/fi_FI/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr ""
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/fr/core.po b/l10n/fr/core.po
index ae26555f77a0f52e76bf285757db9d8376239c4f..14e68eae7e2d550289334a9884b03bbd3f1df123 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Christophe Lherieau <skimpax@gmail.com>, 2012-2013.
+# David Basquin <dba@alternalease.fr>, 2013.
 #   <dba@alternalease.fr>, 2013.
 #   <fkhannouf@me.com>, 2012.
 #   <florentin.lemoal@gmail.com>, 2012.
@@ -18,8 +19,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -28,24 +29,24 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "L'utilisateur %s a partagÃ© un fichier avec vous"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "L'utilsateur %s a partagÃ© un dossier avec vous"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "L'utilisateur %s a partagÃ© le fichier \"%s\" avec vous. Vous pouvez le tÃ©lÃ©charger ici : %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -90,59 +91,135 @@ msgstr "Aucune catÃ©gorie sÃ©lectionnÃ©e pour suppression"
 msgid "Error removing %s from favorites."
 msgstr "Erreur lors de la suppression de %s des favoris."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Dimanche"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Lundi"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Mardi"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Mercredi"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Jeudi"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Vendredi"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Samedi"
+
+#: js/config.php:33
+msgid "January"
+msgstr "janvier"
+
+#: js/config.php:33
+msgid "February"
+msgstr "fÃ©vrier"
+
+#: js/config.php:33
+msgid "March"
+msgstr "mars"
+
+#: js/config.php:33
+msgid "April"
+msgstr "avril"
+
+#: js/config.php:33
+msgid "May"
+msgstr "mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "juin"
+
+#: js/config.php:33
+msgid "July"
+msgstr "juillet"
+
+#: js/config.php:33
+msgid "August"
+msgstr "aoÃ»t"
+
+#: js/config.php:33
+msgid "September"
+msgstr "septembre"
+
+#: js/config.php:33
+msgid "October"
+msgstr "octobre"
+
+#: js/config.php:33
+msgid "November"
+msgstr "novembre"
+
+#: js/config.php:33
+msgid "December"
+msgstr "dÃ©cembre"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ParamÃ¨tres"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "il y a quelques secondes"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "il y a une minute"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "il y a {minutes} minutes"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Il y a une heure"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "Il y a {hours} heures"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "aujourd'hui"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "hier"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "il y a {days} jours"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "le mois dernier"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "Il y a {months} mois"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "il y a plusieurs mois"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "l'annÃ©e derniÃ¨re"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "il y a plusieurs annÃ©es"
 
@@ -172,8 +249,8 @@ msgid "The object type is not specified."
 msgstr "Le type d'objet n'est pas spÃ©cifiÃ©."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Erreur"
 
@@ -185,123 +262,141 @@ msgstr "Le nom de l'application n'est pas spÃ©cifiÃ©."
 msgid "The required file {file} is not installed!"
 msgstr "Le fichier requis {file} n'est pas installÃ© !"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Erreur lors de l'annulation du partage"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Erreur lors du changement des permissions"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "PartagÃ© par {owner} avec vous et le groupe {group}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "PartagÃ© avec vous par {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Partager avec"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Partager via lien"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "ProtÃ©ger par un mot de passe"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Mot de passe"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Envoyez le lien par email"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Envoyer"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "SpÃ©cifier la date d'expiration"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Partager via e-mail :"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Aucun utilisateur trouvÃ©"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisÃ©"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "PartagÃ© dans {item} avec {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "Ã©dition autorisÃ©e"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "contrÃ´le des accÃ¨s"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "crÃ©er"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "mettre Ã  jour"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "ProtÃ©gÃ© par un mot de passe"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Une erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spÃ©cification de la date d'expiration"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "En cours d'envoi ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Email envoyÃ©"
 
+#: 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 "La mise Ã  jour a Ã©chouÃ©. Veuillez signaler ce problÃ¨me Ã  la <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">communautÃ© ownCloud</a>."
+
+#: js/update.js:18
+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
 msgid "ownCloud password reset"
 msgstr "RÃ©initialisation de votre mot de passe Owncloud"
@@ -453,87 +548,11 @@ msgstr "Serveur de la base de donnÃ©es"
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Dimanche"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Lundi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Vendredi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Samedi"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "janvier"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "fÃ©vrier"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "mars"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "avril"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "juin"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "juillet"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "aoÃ»t"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "septembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "octobre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "novembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "dÃ©cembre"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "services web sous votre contrÃ´le"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Se dÃ©connecter"
 
@@ -575,17 +594,3 @@ msgstr "suivant"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Mise Ã  jour en cours d'ownCloud vers la version %s, cela peut prendre du temps."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Alerte de sÃ©curitÃ© !"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Veuillez vÃ©rifier votre mot de passe. <br/>Par sÃ©curitÃ© il vous sera occasionnellement demandÃ© d'entrer votre mot de passe de nouveau."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "VÃ©rification"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index cd05b6ab16762acc558f8512a3c1b35734b96468..dd7d5c263596cc6773d78f842076922535b5c8aa 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -5,6 +5,7 @@
 # Translators:
 # Christophe Lherieau <skimpax@gmail.com>, 2012-2013.
 # Cyril Glapa <kyriog@gmail.com>, 2012.
+# David Basquin <dba@alternalease.fr>, 2013.
 #   <dba@alternalease.fr>, 2013.
 # Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
 #   <gp4004@arghh.org>, 2012.
@@ -19,9 +20,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-09 23:40+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 09:26+0000\n"
+"Last-Translator: dbasquin <dba@alternalease.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -43,46 +44,46 @@ msgstr "Impossible de dÃ©placer %s"
 msgid "Unable to rename file"
 msgstr "Impossible de renommer le fichier"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Aucun fichier n'a Ã©tÃ© chargÃ©. Erreur inconnue"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Aucune erreur, le fichier a Ã©tÃ© tÃ©lÃ©versÃ© avec succÃ¨s"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Le fichier envoyÃ© dÃ©passe la valeur upload_max_filesize situÃ©e dans le fichier php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Le fichier tÃ©lÃ©versÃ© excÃ¨de la valeur de MAX_FILE_SIZE spÃ©cifiÃ©e dans le formulaire HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le fichier n'a Ã©tÃ© que partiellement tÃ©lÃ©versÃ©"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Aucun fichier n'a Ã©tÃ© tÃ©lÃ©versÃ©"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Il manque un rÃ©pertoire temporaire"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Erreur d'Ã©criture sur le disque"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Espace disponible insuffisant"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Plus assez d'espace de stockage disponible"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Dossier invalide."
 
@@ -90,11 +91,11 @@ msgstr "Dossier invalide."
 msgid "Files"
 msgstr "Fichiers"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -102,137 +103,151 @@ msgstr "Supprimer"
 msgid "Rename"
 msgstr "Renommer"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} existe dÃ©jÃ "
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "SuggÃ©rer un nom"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name} a Ã©tÃ© remplacÃ©"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} a Ã©tÃ© remplacÃ© par {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "Fichiers non partagÃ©s : {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "Fichiers supprimÃ©s : {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' n'est pas un nom de fichier valide."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Le nom de fichier ne peut Ãªtre vide."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nom invalide, les caractÃ¨res '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisÃ©s."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Fichier ZIP en cours d'assemblage ;  cela peut prendre du temps."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Votre espage de stockage est plein, les fichiers ne peuvent plus Ãªtre tÃ©lÃ©versÃ©s ou synchronisÃ©s !"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Votre espace de stockage est presque plein ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Erreur de chargement"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Fermer"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "En cours"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fichier en cours de tÃ©lÃ©chargement"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: 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:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Chargement annulÃ©."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "L'URL ne peut-Ãªtre vide"
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} fichiers indexÃ©s"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "erreur lors de l'indexation"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ModifiÃ©"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 dossier"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} dossiers"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 fichier"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} fichiers"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Envoyer"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Gestion des fichiers"
@@ -281,36 +296,32 @@ msgstr "Dossier"
 msgid "From link"
 msgstr "Depuis le lien"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Envoyer"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "TÃ©lÃ©charger"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Fichier trop volumineux"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Analyse en cours"
diff --git a/l10n/fr/files_encryption.po b/l10n/fr/files_encryption.po
index cbad09601fccdccb0ed8bcd187f344339e9c83c0..f1305f621d6a1f281d1664c788da09b4a659f38c 100644
--- a/l10n/fr/files_encryption.po
+++ b/l10n/fr/files_encryption.po
@@ -3,33 +3,81 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Romain DEP. <rom1dep@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 16:26+0000\n"
+"POT-Creation-Date: 2013-01-25 00:05+0100\n"
+"PO-Revision-Date: 2013-01-24 01:10+0000\n"
 "Last-Translator: Romain DEP. <rom1dep@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Veuillez vous connecter depuis votre client de synchronisation ownCloud et changer votre mot de passe de chiffrement pour finaliser la conversion."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "Mode de chiffrement changÃ© en chiffrement cÃ´tÃ© client"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Convertir le mot de passe de chiffrement en mot de passe de connexion"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Veuillez vÃ©rifier vos mots de passe et rÃ©essayer."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Impossible de convertir votre mot de passe de chiffrement en mot de passe de connexion"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Choix du type de chiffrement :"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Chiffrement cÃ´tÃ© client (plus sÃ©curisÃ©, mais ne permet pas l'accÃ¨s Ã  vos donnÃ©es depuis l'interface web)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "Chiffrement cÃ´tÃ© serveur (vous permet d'accÃ©der Ã  vos fichiers depuis l'interface web et depuis le client de synchronisation)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Aucun (pas de chiffrement)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Important : Une fois le mode de chiffrement choisi, il est impossible de revenir en arriÃ¨re"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "Propre Ã  l'utilisateur (laisse le choix Ã  l'utilisateur)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ne pas chiffrer les fichiers dont les types sont les suivants"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Aucun"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activer le chiffrement"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index a88cc9a369b2b88ca6b3b23db0b93a95003a3981..1fb4fdb1de209297593f8dbe4bd12951bed3412e 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: 2012-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 14:20+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\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"
 "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"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Supprimer les versions intermÃ©diaires"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historique"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versions"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Cette opÃ©ration va effacer toutes les versions intermÃ©diaires de vos fichiers (et ne garder que la derniÃ¨re version en date)."
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionnage des fichiers"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 7617ac30e7ddf2ff45d6f7ecabd6e2e06465011e..0ae131d5c58828d2520d52c605be7cc48e22f547 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-26 00:01+0100\n"
-"PO-Revision-Date: 2012-11-25 00:56+0000\n"
+"POT-Creation-Date: 2013-01-25 00:05+0100\n"
+"PO-Revision-Date: 2013-01-24 01:17+0000\n"
 "Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,51 +19,55 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Aide"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personnel"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "ParamÃ¨tres"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Applications"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "TÃ©lÃ©chargement ZIP dÃ©sactivÃ©."
 
-#: files.php:362
+#: files.php:366
 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:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Les fichiers sÃ©lectionnÃ©s sont trop volumineux pour Ãªtre compressÃ©s."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "impossible Ã  dÃ©terminer"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "L'application n'est pas activÃ©e"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
@@ -83,55 +87,55 @@ msgstr "Texte"
 msgid "Images"
 msgstr "Images"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Ã  l'instant"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "il y a 1 minute"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "il y a %d minutes"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Il y a une heure"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Il y a %d heures"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "aujourd'hui"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "hier"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "il y a %d jours"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "le mois dernier"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Il y a %d mois"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "l'annÃ©e derniÃ¨re"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "il y a plusieurs annÃ©es"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 9f3a6ceea3b2e3c748509b84df3196e407f7dcf5..c2827253a3b9553a06cab9c3165551dcb04eea88 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -102,7 +102,7 @@ msgstr "Activer"
 msgid "Saving..."
 msgstr "Sauvegarde..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "FranÃ§ais"
 
@@ -114,15 +114,15 @@ msgstr "Ajoutez votre application"
 msgid "More Apps"
 msgstr "Plus d'applicationsâ€¦"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "SÃ©lectionner une Application"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Voir la page des applications Ã  l'url apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "DistribuÃ© sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>"
 
@@ -171,7 +171,7 @@ msgstr "TÃ©lÃ©charger le client Android"
 msgid "Download iOS Client"
 msgstr "TÃ©lÃ©charger le client iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -241,11 +241,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nom"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Groupes"
 
@@ -257,26 +257,30 @@ msgstr "CrÃ©er"
 msgid "Default Storage"
 msgstr "Support de stockage par dÃ©faut"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "IllimitÃ©"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Autre"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Groupe Admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Support de stockage"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "DÃ©faut"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Supprimer"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index d435d3b77ce46fd697011e6675ebcf52c1174c9a..1beebaaf58fb111da7bec75126004611fa0a8ada 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -6,16 +6,16 @@
 # Cyril Glapa <kyriog@gmail.com>, 2012.
 #   <mathieu.payrol@gmail.com>, 2012.
 #   <mishka.lazzlo@gmail.com>, 2012.
-# Romain DEP. <rom1dep@gmail.com>, 2012.
+# Romain DEP. <rom1dep@gmail.com>, 2012-2013.
 #   <windes@tructor.net>, 2012.
 #   <zrk951@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-25 00:10+0100\n"
-"PO-Revision-Date: 2012-12-24 14:18+0000\n"
-"Last-Translator: mishka <mishka.lazzlo@gmail.com>\n"
+"POT-Creation-Date: 2013-01-25 00:05+0100\n"
+"PO-Revision-Date: 2013-01-24 01:50+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@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"
@@ -32,9 +32,9 @@ msgstr "<b>Avertissement:</b> Les applications user_ldap et user_webdavauth sont
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Avertissement:</b> Le module PHP LDAP requis n'est pas installÃ©, l'application ne marchera pas. Contactez votre administrateur systÃ¨me pour qu'il l'installe."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Attention :</b> Le module php LDAP n'est pas installÃ©, par consÃ©quent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur systÃ¨me afin qu'il l'installe."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -49,9 +49,13 @@ msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans
 msgid "Base DN"
 msgstr "DN Racine"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Un DN racine par ligne"
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Vous pouvez dÃ©tailler les DN Racines de vos utilisateurs et groupes dans l'onglet AvancÃ©"
+msgstr "Vous pouvez spÃ©cifier les DN Racines de vos utilisateurs et groupes via l'onglet AvancÃ©"
 
 #: templates/settings.php:17
 msgid "User DN"
@@ -62,7 +66,7 @@ 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 "Le DN de l'utilisateur client avec lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour l'accÃ¨s anonyme, laisser le DN et le mot de passe vides."
+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:18
 msgid "Password"
@@ -120,10 +124,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "DN racine de l'arbre utilisateurs"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Un DN racine utilisateur par ligne"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "DN racine de l'arbre groupes"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Un DN racine groupe par ligne"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Association groupe-membre"
diff --git a/l10n/fr/user_webdavauth.po b/l10n/fr/user_webdavauth.po
index d99b5eb69dcf6d829c27e63650688ae833a6ed10..4d665c8ff422130f9b5afd0e1625416490630b67 100644
--- a/l10n/fr/user_webdavauth.po
+++ b/l10n/fr/user_webdavauth.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 17:09+0000\n"
-"Last-Translator: mishka <mishka.lazzlo@gmail.com>\n"
+"POT-Creation-Date: 2013-01-25 00:05+0100\n"
+"PO-Revision-Date: 2013-01-24 01:04+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,13 +22,17 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Authentification WebDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL : http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud "
+"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 enverra les informations de connexion Ã  cette adresse. Ce module complÃ©mentaire analyse le code rÃ©ponse HTTP et considÃ¨re tout code diffÃ©rent des codes 401 et 403 comme associÃ© Ã  une authentification correcte."
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 01745599b05816bb6e75399d694768eeda40e85f..e2701a3713b8f1a55640dad0b49bc2500c9afc5b 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
-"PO-Revision-Date: 2013-01-13 10:51+0000\n"
-"Last-Translator: XosÃ© M. Lamas <correo.xmgz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,24 +20,24 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "O usuario %s compartÃu un ficheiro con vostede"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "O usuario %s compartÃu un cartafol con vostede"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "O usuario %s compartiu o ficheiro Â«%sÂ» con vostede. Teno dispoÃ±Ãbel en: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +82,135 @@ msgstr "Non hai categorÃas seleccionadas para eliminar."
 msgid "Error removing %s from favorites."
 msgstr "Produciuse un erro ao eliminar %s dos favoritos."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Domingo"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Luns"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Martes"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "MÃ©rcores"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Xoves"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Venres"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "SÃ¡bado"
+
+#: js/config.php:33
+msgid "January"
+msgstr "xaneiro"
+
+#: js/config.php:33
+msgid "February"
+msgstr "febreiro"
+
+#: js/config.php:33
+msgid "March"
+msgstr "marzo"
+
+#: js/config.php:33
+msgid "April"
+msgstr "abril"
+
+#: js/config.php:33
+msgid "May"
+msgstr "maio"
+
+#: js/config.php:33
+msgid "June"
+msgstr "xuÃ±o"
+
+#: js/config.php:33
+msgid "July"
+msgstr "xullo"
+
+#: js/config.php:33
+msgid "August"
+msgstr "agosto"
+
+#: js/config.php:33
+msgid "September"
+msgstr "setembro"
+
+#: js/config.php:33
+msgid "October"
+msgstr "outubro"
+
+#: js/config.php:33
+msgid "November"
+msgstr "novembro"
+
+#: js/config.php:33
+msgid "December"
+msgstr "decembro"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ConfiguraciÃ³ns"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "hai {minutes} minutos"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "hai 1 hora"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "hai {hours} horas"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "hoxe"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "onte"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "hai {days} dÃas"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ãºltimo mes"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "hai {months} meses"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
@@ -164,8 +240,8 @@ msgid "The object type is not specified."
 msgstr "Non se especificou o tipo de obxecto."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Erro"
 
@@ -177,123 +253,141 @@ msgstr "Non se especificou o nome do aplicativo."
 msgid "The required file {file} is not installed!"
 msgstr "Non estÃ¡ instalado o ficheiro {file} que se precisa"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Produciuse un erro ao compartir"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Produciuse un erro ao deixar de compartir"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Produciuse un erro ao cambiar os permisos"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartido con vostede e co grupo {group} por {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Compartido con vostede por {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Compartir con"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Compartir coa ligazÃ³n"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Protexido con contrasinais"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Contrasinal"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Enviar ligazÃ³n por correo"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Definir a data de caducidade"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Data de caducidade"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Compartir por correo:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Non se atopou xente"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Non se permite volver a compartir"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Produciuse un erro ao retirar a data de caducidade"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Produciuse un erro ao definir a data de caducidade"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Enviando..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Correo enviado"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "Restabelecer o contrasinal de ownCloud"
@@ -445,87 +539,11 @@ msgstr "Servidor da base de datos"
 msgid "Finish setup"
 msgstr "Rematar a configuraciÃ³n"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Domingo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Luns"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Martes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "MÃ©rcores"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Xoves"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Venres"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "SÃ¡bado"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "xaneiro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "febreiro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "marzo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "abril"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "maio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "xuÃ±o"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "xullo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "agosto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "setembro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "outubro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "novembro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "decembro"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Desconectar"
 
@@ -567,17 +585,3 @@ msgstr "seguinte"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Actualizando ownCloud a versiÃ³n %s,  esto pode levar un anaco."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Advertencia de seguranza"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Verifique o seu contrasinal.<br/>Por motivos de seguranza pode que ocasionalmente se lle pregunte de novo polo seu contrasinal."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 2387a6610f3d22d004c6851a6d50795886cfcaff..a303b105799f85911d1e533e0f1bbda59c2b1e16 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.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-14 00:17+0100\n"
-"PO-Revision-Date: 2013-01-13 10:49+0000\n"
-"Last-Translator: XosÃ© M. Lamas <correo.xmgz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr "Non se puido mover %s"
 msgid "Unable to rename file"
 msgstr "Non se pode renomear o ficheiro"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Non se subiu ningÃºn ficheiro. Erro descoÃ±ecido."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Non hai erros. O ficheiro enviouse correctamente"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O ficheiro subido excede a directiva indicada polo tamaÃ±o_mÃ¡ximo_de_subida de php.ini"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado foi sÃ³ parcialmente enviado"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Non se enviou ningÃºn ficheiro"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Falta un cartafol temporal"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Erro ao escribir no disco"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "O espazo dispoÃ±Ãbel Ã© insuficiente"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "O directorio Ã© incorrecto."
 
@@ -80,11 +80,11 @@ msgstr "O directorio Ã© incorrecto."
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -92,137 +92,151 @@ msgstr "Eliminar"
 msgid "Rename"
 msgstr "Mudar o nome"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "xa existe un {new_name}"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "substituÃr"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "suxerir nome"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "substituÃr {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituÃr {new_name} polo {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "{files} sen compartir"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} eliminados"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' Ã© un nonme de ficheiro non vÃ¡lido"
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "O nome de ficheiro non pode estar baldeiro"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome non vÃ¡lido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non se permiten."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "xerando un ficheiro ZIP, o que pode levar un anaco."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Non se puido subir o ficheiro pois ou Ã© un directorio ou ten 0 bytes"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Erro na subida"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Pechar"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 ficheiro subÃndose"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} ficheiros subÃndose"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "A subida do ficheiro estÃ¡ en curso. SaÃr agora da pÃ¡xina cancelarÃ¡ a subida."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL non pode quedar baleiro."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nome de cartafol non vÃ¡lido. O uso de 'Shared' estÃ¡ reservado por Owncloud"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} ficheiros escaneados"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "erro mentres analizaba"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "TamaÃ±o"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 cartafol"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} cartafoles"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Enviar"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Manexo de ficheiro"
@@ -271,36 +285,32 @@ msgstr "Cartafol"
 msgid "From link"
 msgstr "Dende a ligazÃ³n"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Enviar"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Cancelar a subida"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Nada por aquÃ. EnvÃa algo."
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "EnvÃo demasiado grande"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiros que trata de subir superan o tamaÃ±o mÃ¡ximo permitido neste servidor"
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros. Agarda."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "AnÃ¡lise actual"
diff --git a/l10n/gl/files_encryption.po b/l10n/gl/files_encryption.po
index 367cd2cd0637af76eeebdabbbb91e7129f070226..ba0a8e899dab48f7c493ffc33593420f32f91d5d 100644
--- a/l10n/gl/files_encryption.po
+++ b/l10n/gl/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 22:19+0000\n"
-"Last-Translator: Miguel Branco <mgl.branco@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "ExcluÃr os seguintes tipos de ficheiro do cifrado"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Nada"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activar o cifrado"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index aeb062c08df14b98a799220ad6c9ee19f54a3c69..c0ac98462b7be16b8eba8f6bed00c49ef0179d4c 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/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: 2012-11-30 00:03+0100\n"
-"PO-Revision-Date: 2012-11-29 16:08+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
@@ -20,22 +20,10 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Caducan todas as versiÃ³ns"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historial"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "VersiÃ³ns"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Isto eliminarÃ¡ todas as copias de seguranza que haxa dos seus ficheiros"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Sistema de versiÃ³n de ficheiros"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 739b0ba67ff2c7293869d675374527c9ee7320df..c6fc161311af6285d7e8bcae12eaa71340128629 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.po
@@ -5,14 +5,14 @@
 # Translators:
 #   <mbouzada@gmail.com>, 2012.
 # Miguel Branco <mgl.branco@gmail.com>, 2012.
-# XosÃ© M. Lamas <correo.xmgz@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: 2012-12-08 00:10+0100\n"
-"PO-Revision-Date: 2012-12-06 11:56+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 06:11+0000\n"
+"Last-Translator: XosÃ© M. Lamas <correo.xmgz@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"
@@ -20,51 +20,55 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "Axuda"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "Persoal"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "ConfiguraciÃ³ns"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "Aplicativos"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "AdministraciÃ³n"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "As descargas ZIP estÃ¡n desactivadas"
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros necesitan seren descargados de un en un."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Volver aos ficheiros"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados son demasiado grandes como para xerar un ficheiro zip."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "non puido ser determinado"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "O aplicativo non estÃ¡ activado"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Produciuse un erro na autenticaciÃ³n"
 
@@ -84,55 +88,55 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imaxes"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "hai segundos"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "hai 1 minuto"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "hai %d minutos"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Vai 1 hora"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Vai %d horas"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hoxe"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "onte"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "hai %d dÃas"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ãºltimo mes"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Vai %d meses"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 428b5f06cd5c0746c47e2f649b8d22593541088b..d5af9d142a9429cb40c1923f267a033b8f36ef06 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Activar"
 msgid "Saving..."
 msgstr "Gardando..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Galego"
 
@@ -102,15 +102,15 @@ msgstr "Engada o seu aplicativo"
 msgid "More Apps"
 msgstr "MÃ¡is aplicativos"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Escolla un aplicativo"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Consulte a pÃ¡xina do aplicativo en apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>"
 
@@ -159,7 +159,7 @@ msgstr "Descargar clientes para Android"
 msgid "Download iOS Client"
 msgstr "Descargar clientes ra iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -229,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nome"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupos"
 
@@ -245,26 +245,30 @@ msgstr "Crear"
 msgid "Default Storage"
 msgstr "Almacenamento predeterminado"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Sen lÃmites"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo Admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Almacenamento"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predeterminado"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Eliminar"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 024f611c1870fd220b01f180a1e177f39fab79ff..66d3c446382eb06e53a941811c4341f10216feaa 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.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-01 00:04+0100\n"
-"PO-Revision-Date: 2012-12-31 08:48+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
@@ -28,9 +28,9 @@ msgstr "<b>Aviso:</b> Os aplicativos user_ldap e user_webdavauth son incompatÃb
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Aviso:</b> O mÃ³dulo PHP LDAP Ã© necesario e non estÃ¡ instalado, a infraestrutura non funcionarÃ¡. Consulte co administrador do sistema para instalalo."
+"<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 "Host"
@@ -45,6 +45,10 @@ msgstr "Pode omitir o protocolo agÃ¡s que precise de SSL. Nese caso comece con l
 msgid "Base DN"
 msgstr "DN base"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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Â»"
@@ -116,10 +120,18 @@ msgstr "Porto"
 msgid "Base User Tree"
 msgstr "Base da Ã¡rbore de usuarios"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Base da Ã¡rbore de grupo"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "AsociaciÃ³n de grupos e membros"
diff --git a/l10n/gl/user_webdavauth.po b/l10n/gl/user_webdavauth.po
index 5630c82c50ee5b6dd26909da31772dc1a87c98e5..2004bb9b3c378d6e1430650310019f5e4a4d7e9f 100644
--- a/l10n/gl/user_webdavauth.po
+++ b/l10n/gl/user_webdavauth.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <mbouzada@gmail.com>, 2012.
 # Miguel Branco, 2012.
+# XosÃ© M. Lamas <correo.xmgz@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-01 00:04+0100\n"
-"PO-Revision-Date: 2012-12-31 08:22+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2013-01-19 00:04+0100\n"
+"PO-Revision-Date: 2013-01-18 06:15+0000\n"
+"Last-Translator: XosÃ© M. Lamas <correo.xmgz@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"
@@ -19,13 +20,17 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "AutenticaciÃ³n WebDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud enviarÃ¡ as credenciais do usuario a este URL,  http 401 e http 403 interpretanse como credenciais incorrectas e todos os outros cÃ³digos  como credenciais correctas."
+"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 enviarÃ¡ as credenciais do usuario a esta URL. Este conector comproba a resposta e interpretarÃ¡ os cÃ³digos de estado 401 e 403 como credenciais non vÃ¡lidas, e todas as outras respostas como credenciais vÃ¡lidas."
diff --git a/l10n/he/core.po b/l10n/he/core.po
index a573946604bb89eceda99521ea833590c9464f0f..c3ae441a83cb23e7fe8a9f75bf1fc4625adac570 100644
--- a/l10n/he/core.po
+++ b/l10n/he/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -22,24 +22,24 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "×”×ž×©×ª×ž×© %s ×©×™×ª×£ ××ª×š ×§×•×‘×¥"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "×”×ž×©×ª×ž×© %s ×©×™×ª×£ ××ª×š ×ª×™×§×™×™×”"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -84,59 +84,135 @@ msgstr "×œ× × ×‘×—×¨×• ×§×˜×’×•×¨×™×•×ª ×œ×ž×—×™×§×”"
 msgid "Error removing %s from favorites."
 msgstr "×©×’×™××” ×‘×”×¡×¨×ª %s ×ž×”×ž×•×¢×“×¤×™×."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "×™×•× ×¨××©×•×Ÿ"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "×™×•× ×©× ×™"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "×™×•× ×©×œ×™×©×™"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "×™×•× ×¨×‘×™×¢×™"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "×™×•× ×—×ž×™×©×™"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "×™×•× ×©×™×©×™"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "×©×‘×ª"
+
+#: js/config.php:33
+msgid "January"
+msgstr "×™× ×•××¨"
+
+#: js/config.php:33
+msgid "February"
+msgstr "×¤×‘×¨×•××¨"
+
+#: js/config.php:33
+msgid "March"
+msgstr "×ž×¨×¥"
+
+#: js/config.php:33
+msgid "April"
+msgstr "××¤×¨×™×œ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "×ž××™"
+
+#: js/config.php:33
+msgid "June"
+msgstr "×™×•× ×™"
+
+#: js/config.php:33
+msgid "July"
+msgstr "×™×•×œ×™"
+
+#: js/config.php:33
+msgid "August"
+msgstr "××•×’×•×¡×˜"
+
+#: js/config.php:33
+msgid "September"
+msgstr "×¡×¤×˜×ž×‘×¨"
+
+#: js/config.php:33
+msgid "October"
+msgstr "××•×§×˜×•×‘×¨"
+
+#: js/config.php:33
+msgid "November"
+msgstr "× ×•×‘×ž×‘×¨"
+
+#: js/config.php:33
+msgid "December"
+msgstr "×“×¦×ž×‘×¨"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "×”×’×“×¨×•×ª"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "×©× ×™×•×ª"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "×œ×¤× ×™ ×“×§×” ××—×ª"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "×œ×¤× ×™ {minutes} ×“×§×•×ª"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "×œ×¤× ×™ ×©×¢×”"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "×œ×¤× ×™ {hours} ×©×¢×•×ª"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "×”×™×•×"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "××ª×ž×•×œ"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "×œ×¤× ×™ {days} ×™×ž×™×"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "×—×•×“×© ×©×¢×‘×¨"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "×œ×¤× ×™ {months} ×—×•×“×©×™×"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "×—×•×“×©×™×"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "×©× ×” ×©×¢×‘×¨×”"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "×©× ×™×"
 
@@ -166,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "×©×’×™××”"
 
@@ -179,123 +255,141 @@ msgstr "×©× ×”×™×™×©×•× ×œ× ×¦×•×™×Ÿ."
 msgid "The required file {file} is not installed!"
 msgstr "×”×§×•×‘×¥ ×”× ×“×¨×© {file} ××™× ×• ×ž×•×ª×§×Ÿ!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×”×©×™×ª×•×£"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×‘×™×˜×•×œ ×”×©×™×ª×•×£"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "×©×’×™××” ×‘×ž×”×œ×š ×©×™× ×•×™ ×”×”×’×“×¨×•×ª"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "×©×•×ª×£ ××ª×š ×•×¢× ×”×§×‘×•×¦×” {group} ×©×‘×‘×¢×œ×•×ª {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "×©×•×ª×£ ××ª×š ×¢×œ ×™×“×™ {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "×©×™×ª×•×£ ×¢×"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "×©×™×ª×•×£ ×¢× ×§×™×©×•×¨"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "×”×’× ×” ×‘×¡×¡×ž×”"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "×¡×¡×ž×”"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "×©×œ×™×—×ª ×§×™×©×•×¨ ×‘×“×•××´×œ ×œ×ž×©×ª×ž×©"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "×©×œ×™×—×”"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "×”×’×“×¨×ª ×ª××¨×™×š ×ª×¤×•×’×”"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "×©×™×ª×•×£ ×‘××ž×¦×¢×•×ª ×“×•××´×œ:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "×œ× × ×ž×¦××• ×× ×©×™×"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "××¡×•×¨ ×œ×¢×©×•×ª ×©×™×ª×•×£ ×ž×—×“×©"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "×©×•×ª×£ ×ª×—×ª {item} ×¢× {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "×”×¡×¨ ×©×™×ª×•×£"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "× ×™×ª×Ÿ ×œ×¢×¨×•×š"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "×‘×§×¨×ª ×’×™×©×”"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "×™×¦×™×¨×”"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "×¢×“×›×•×Ÿ"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "×ž×—×™×§×”"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "×©×™×ª×•×£"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "×ž×•×’×Ÿ ×‘×¡×¡×ž×”"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "××™×¨×¢×” ×©×’×™××” ×‘×‘×™×˜×•×œ ×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "××™×¨×¢×” ×©×’×™××” ×‘×¢×ª ×”×’×“×¨×ª ×ª××¨×™×š ×”×ª×¤×•×’×”"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "×ž×ª×‘×¦×¢×ª ×©×œ×™×—×” ..."
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "××™×¤×•×¡ ×”×¡×¡×ž×” ×©×œ ownCloud"
@@ -447,87 +541,11 @@ msgstr "×©×¨×ª ×‘×¡×™×¡ × ×ª×•× ×™×"
 msgid "Finish setup"
 msgstr "×¡×™×•× ×”×ª×§× ×”"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "×™×•× ×¨××©×•×Ÿ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "×™×•× ×©× ×™"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "×™×•× ×©×œ×™×©×™"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "×™×•× ×¨×‘×™×¢×™"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "×™×•× ×—×ž×™×©×™"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "×™×•× ×©×™×©×™"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "×©×‘×ª"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "×™× ×•××¨"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "×¤×‘×¨×•××¨"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "×ž×¨×¥"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "××¤×¨×™×œ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "×ž××™"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "×™×•× ×™"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "×™×•×œ×™"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "××•×’×•×¡×˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "×¡×¤×˜×ž×‘×¨"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "××•×§×˜×•×‘×¨"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "× ×•×‘×ž×‘×¨"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "×“×¦×ž×‘×¨"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "×©×™×¨×•×ª×™ ×¨×©×ª ×‘×©×œ×™×˜×ª×š"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "×”×ª× ×ª×§×•×ª"
 
@@ -569,17 +587,3 @@ msgstr "×”×‘×"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "×ž×¢×“×›×Ÿ ××ª ownCloud ××œ ×’×¨×¡× %s, ×–×” ×¢×œ×•×œ ×œ×§×—×ª ×–×ž×Ÿ ×ž×”."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "××–×”×¨×ª ××‘×˜×—×”!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "× × ×œ××ž×ª ××ª ×”×¡×¡×ž×” ×©×œ×š. <br/>×ž×˜×¢×ž×™ ××‘×˜×—×” ×™×ª×›×Ÿ ×©×ª×•×¤×™×¢ ×‘×§×©×” ×œ×”×–×™×Ÿ ××ª ×”×¡×¡×ž×” ×©×•×‘."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "××™×ž×•×ª"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index cbf762beda75e5c891cb8d634a33e6d97872a86a..60b53f30b7dd0e511f4925f9f130147743b45acb 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -35,46 +35,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "×œ× ×”×•×¢×œ×” ×§×•×‘×¥. ×˜×¢×•×ª ×‘×œ×ª×™ ×ž×–×•×”×”."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "×œ× ××™×¨×¢×” ×ª×§×œ×”, ×”×§×‘×¦×™× ×”×•×¢×œ×• ×‘×”×¦×œ×—×”"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "×”×§×‘×¦×™× ×©× ×©×œ×—×• ×—×•×¨×’×™× ×ž×”×’×•×“×œ ×©×¦×•×™×Ÿ ×‘×”×’×“×¨×” upload_max_filesize ×©×‘×§×•×‘×¥ php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "×”×§×•×‘×¥ ×©×”×•×¢×œ×” ×—×¨×’ ×ž×”×”× ×—×™×” MAX_FILE_SIZE ×©×¦×•×™× ×” ×‘×˜×•×¤×¡ ×”Ö¾HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "×”×§×•×‘×¥ ×©×”×•×¢×œ×” ×”×•×¢×œ×” ×‘×¦×•×¨×” ×—×œ×§×™×ª"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "×œ× ×”×•×¢×œ×• ×§×‘×¦×™×"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "×ª×™×§×™×™×” ×–×ž× ×™×ª ×—×¡×¨×”"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "×”×›×ª×™×‘×” ×œ×›×•× ×Ÿ × ×›×©×œ×”"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,11 +82,11 @@ msgstr ""
 msgid "Files"
 msgstr "×§×‘×¦×™×"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "×”×¡×¨ ×©×™×ª×•×£"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "×ž×—×™×§×”"
 
@@ -94,137 +94,151 @@ msgstr "×ž×—×™×§×”"
 msgid "Rename"
 msgstr "×©×™× ×•×™ ×©×"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} ×›×‘×¨ ×§×™×™×"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "×”×—×œ×¤×”"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "×”×¦×¢×ª ×©×"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "×‘×™×˜×•×œ"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name} ×”×•×—×œ×£"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "×‘×™×˜×•×œ"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ×”×•×—×œ×£ ×‘Ö¾{old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "×‘×•×˜×œ ×©×™×ª×•×¤× ×©×œ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} × ×ž×—×§×•"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "×”×©× ×©×’×•×™, ××¡×•×¨ ×œ×”×©×ª×ž×© ×‘×ª×•×•×™× '\\', '/', '<', '>', ':', '\"', '|', '?' ×•Ö¾'*'."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "×™×•×¦×¨ ×§×•×‘×¥ ZIP, ×× × ×”×ž×ª×Ÿ."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "×œ× ×™×›×•×œ ×œ×”×¢×œ×•×ª ××ª ×”×§×•×‘×¥ ×ž×›×™×•×•×Ÿ ×©×–×• ×ª×§×™×” ××• ×©×ž×©×§×œ ×”×§×•×‘×¥ 0 ×‘×ª×™×"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "×©×’×™××ª ×”×¢×œ××”"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "×¡×’×™×¨×”"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "×ž×ž×ª×™×Ÿ"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "×§×•×‘×¥ ××—×“ × ×©×œ×—"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} ×§×‘×¦×™× × ×©×œ×—×™×"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "×”×”×¢×œ××” ×‘×•×˜×œ×”."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "×ž×ª×‘×¦×¢×ª ×›×¢×ª ×”×¢×œ××ª ×§×‘×¦×™×. ×¢×–×™×‘×” ×©×œ ×”×¢×ž×•×“ ×ª×‘×˜×œ ××ª ×”×”×¢×œ××”."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "×§×™×©×•×¨ ××™× ×• ×™×›×•×œ ×œ×”×™×•×ª ×¨×™×§."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} ×§×‘×¦×™× × ×¡×¨×§×•"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "××™×¨×¢×” ×©×’×™××” ×‘×ž×”×œ×š ×”×¡×¨×™×§×”"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "×©×"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "×’×•×“×œ"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "×–×ž×Ÿ ×©×™× ×•×™"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "×ª×™×§×™×™×” ××—×ª"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} ×ª×™×§×™×•×ª"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "×§×•×‘×¥ ××—×“"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} ×§×‘×¦×™×"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "×”×¢×œ××”"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "×˜×™×¤×•×œ ×‘×§×‘×¦×™×"
@@ -273,36 +287,32 @@ msgstr "×ª×™×§×™×™×”"
 msgid "From link"
 msgstr "×ž×§×™×©×•×¨"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "×”×¢×œ××”"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "×‘×™×˜×•×œ ×”×”×¢×œ××”"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "××™×Ÿ ×›××Ÿ ×©×•× ×“×‘×¨. ××•×œ×™ ×‘×¨×¦×•× ×š ×œ×”×¢×œ×•×ª ×ž×©×”×•?"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "×”×•×¨×“×”"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "×”×¢×œ××” ×’×“×•×œ×” ×ž×™×“×™"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "×”×§×‘×¦×™× ×©× ×™×¡×™×ª ×œ×”×¢×œ×•×ª ×—×¨×’×• ×ž×”×’×•×“×œ ×”×ž×§×¡×™×ž×œ×™ ×œ×”×¢×œ××ª ×§×‘×¦×™× ×¢×œ ×©×¨×ª ×–×”."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "×”×§×‘×¦×™× × ×¡×¨×§×™×, × × ×œ×”×ž×ª×™×Ÿ."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "×”×¡×¨×™×§×” ×”× ×•×›×—×™×ª"
diff --git a/l10n/he/files_encryption.po b/l10n/he/files_encryption.po
index 860989631c47a861a42e41182045517d0aa748da..cd62f06daf79b773881a070433ed5730d57f0f80 100644
--- a/l10n/he/files_encryption.po
+++ b/l10n/he/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 17:21+0000\n"
-"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "×”×¦×¤× ×”"
 
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "×”×¤×¢×œ ×”×¦×¤× ×”"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "×”×•×¦× ××ª ×¡×•×’×™ ×”×§×‘×¦×™× ×”×‘××™× ×ž×”×¦×¤× ×”"
 
-#: templates/settings.php:7
+#: templates/settings.php:71
 msgid "None"
 msgstr "×›×œ×•×"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "×”×•×¦× ××ª ×¡×•×’×™ ×”×§×‘×¦×™× ×”×‘××™× ×ž×”×¦×¤× ×”"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index 6c4367359de3f204c48541f0fa96bf65d0fc2ff1..15bb3e971b3234dddef98204cbe491893e4a51b7 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.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-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 07:21+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\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"
 "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"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "×”×¤×’×ª ×ª×•×§×£ ×›×œ ×”×’×¨×¡××•×ª"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "×”×™×¡×˜×•×¨×™×”"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "×’×¨×¡××•×ª"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "×¤×¢×•×œ×” ×–×• ×ª×ž×—×§ ××ª ×›×œ ×’×™×‘×•×™×™ ×”×’×¨×¡××•×ª ×”×§×™×™×ž×™× ×©×œ ×”×§×‘×¦×™× ×©×œ×š"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "×©×ž×™×¨×ª ×”×‘×“×œ×™ ×’×¨×¡××•×ª ×©×œ ×§×‘×¦×™×"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index de97f2df8845d53a76057c7f4538cd0e25d79e68..8383f3ccc95277107e84f50b9b63db36cc786349 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.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-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 06:32+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "×¢×–×¨×”"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "××™×©×™"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "×”×’×“×¨×•×ª"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "×ž×©×ª×ž×©×™×"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "×™×™×©×•×ž×™×"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "×ž× ×”×œ"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "×”×•×¨×“×ª ZIP ×›×‘×•×™×”"
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "×™×© ×œ×”×•×¨×™×“ ××ª ×”×§×‘×¦×™× ××—×“ ××—×¨×™ ×”×©× ×™."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "×—×–×¨×” ×œ×§×‘×¦×™×"
 
-#: files.php:386
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "×©×’×™××ª ×”×–×“×”×•×ª"
 
@@ -83,55 +87,55 @@ msgstr "×˜×§×¡×˜"
 msgid "Images"
 msgstr "×ª×ž×•× ×•×ª"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "×©× ×™×•×ª"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "×œ×¤× ×™ ×“×§×” ××—×ª"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "×œ×¤× ×™ %d ×“×§×•×ª"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "×œ×¤× ×™ ×©×¢×”"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "×œ×¤× ×™ %d ×©×¢×•×ª"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "×”×™×•×"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "××ª×ž×•×œ"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "×œ×¤× ×™ %d ×™×ž×™×"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "×—×•×“×© ×©×¢×‘×¨"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "×œ×¤× ×™ %d ×—×•×“×©×™×"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "×©× ×” ×©×¢×‘×¨×”"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "×©× ×™×"
 
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 312975f7b15811e2e301cd9dfa06bc3d270397fd..53f1026fb77bbb95fa9a7dd596ade62cc25125d1 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "×”×¤×¢×œ"
 msgid "Saving..."
 msgstr "×©×•×ž×¨.."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "×¢×‘×¨×™×ª"
 
@@ -103,15 +103,15 @@ msgstr "×”×•×¡×¤×ª ×”×™×™×©×•× ×©×œ×š"
 msgid "More Apps"
 msgstr "×™×™×©×•×ž×™× × ×•×¡×¤×™×"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "×‘×—×™×¨×ª ×™×™×©×•×"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "×¦×¤×” ×‘×¢×ž×•×“ ×”×™×©×•× ×‘ apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "×‘×¨×™×©×™×•×Ÿ <span class=\"licence\"></span>×œ×˜×•×‘×ª <span class=\"author\"></span>"
 
@@ -160,7 +160,7 @@ msgstr "×”×•×¨×“ ×ª×•×›× ×” ×œ×× ×“×¨×•××™×“"
 msgid "Download iOS Client"
 msgstr "×”×•×¨×“ ×ª×•×›× ×” ×œiOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "×¡×¡×ž×”"
 
@@ -230,11 +230,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "×©×"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "×§×‘×•×¦×•×ª"
 
@@ -246,26 +246,30 @@ msgstr "×™×¦×™×¨×”"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "××—×¨"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "×ž× ×”×œ ×”×§×‘×•×¦×”"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "×ž×—×™×§×”"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 72b23d8588163d5c00ad037254f3bf3b620b3da9..ec42e5a08541208265bc630c3f24f2af4c8a0b22 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 10:25+0000\n"
-"Last-Translator: Gilad Naaman <gilad.doom@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/he/user_webdavauth.po b/l10n/he/user_webdavauth.po
index e9a1a74eb85e16b642e77eb1bb1b7cb3fbabba51..65a279ed44f5a506b730b55bc449bc9d3bc19cbf 100644
--- a/l10n/he/user_webdavauth.po
+++ b/l10n/he/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: he\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/hi/core.po b/l10n/hi/core.po
index a8ef62c1352266f00766d3a2e1d5cbd66129cc65..3e666c18c78e99350d0fc08087c2e24aa085692a 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,59 +81,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:33
+msgid "January"
+msgstr ""
+
+#: js/config.php:33
+msgid "February"
+msgstr ""
+
+#: js/config.php:33
+msgid "March"
+msgstr ""
+
+#: js/config.php:33
+msgid "April"
+msgstr ""
+
+#: js/config.php:33
+msgid "May"
+msgstr ""
+
+#: js/config.php:33
+msgid "June"
+msgstr ""
+
+#: js/config.php:33
+msgid "July"
+msgstr ""
+
+#: js/config.php:33
+msgid "August"
+msgstr ""
+
+#: js/config.php:33
+msgid "September"
+msgstr ""
+
+#: js/config.php:33
+msgid "October"
+msgstr ""
+
+#: js/config.php:33
+msgid "November"
+msgstr ""
+
+#: js/config.php:33
+msgid "December"
+msgstr ""
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -163,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr ""
 
@@ -176,123 +252,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -444,87 +538,11 @@ msgstr ""
 msgid "Finish setup"
 msgstr "à¤¸à¥‡à¤Ÿà¤…à¤ª à¤¸à¤®à¤¾à¤ªà¥à¤¤ à¤•à¤°à¥‡"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr ""
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr ""
 
@@ -566,17 +584,3 @@ msgstr "à¤…à¤—à¤²à¤¾"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index c555c20841b92bdfe26a6691ff453ad84a454e0f..0c74c7074fb6fae3fad593d54688d7663dc01dcf 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -31,46 +31,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -78,11 +78,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr ""
 
@@ -90,137 +90,151 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr ""
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr ""
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -269,36 +283,32 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/hi/files_encryption.po b/l10n/hi/files_encryption.po
index e6ff91a68b51879e3d2ac5009cfca524d2974880..83154bdbcbf8f2aa972906c553e81275d1e52fd4 100644
--- a/l10n/hi/files_encryption.po
+++ b/l10n/hi/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index 1f21f8aca780f923e17dc2261f5ed22b0d6fe5af..293e4b558a76e816591fda14239c9bca26b1a55b 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 310d410a6e996bf71e02404c143d33f4637d92ec..9cb97532356ba2242da5f0b901f1887de2557bca 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr ""
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr ""
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr ""
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr ""
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index b6697b9482069af1bbe005f65c01f4534313e9a3..9af2a151483468f00a733e855f73330afb1000e7 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -87,7 +87,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr ""
 
@@ -99,15 +99,15 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "à¤ªà¤¾à¤¸à¤µà¤°à¥à¤¡"
 
@@ -226,11 +226,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr ""
 
@@ -242,26 +242,30 @@ msgstr ""
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index ae9f03b0212c553679db00848da51a348c6c1d23..012f8d3f3aa8727e74088de709e3fbecb6ce9c5f 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/hi/user_webdavauth.po b/l10n/hi/user_webdavauth.po
index aa784d7aad04e943357c7f6cfa7b7fe22bdceb1a..cc71e94d7f6eab442e509a45b044090240a97617 100644
--- a/l10n/hi/user_webdavauth.po
+++ b/l10n/hi/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: hi\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/hr/core.po b/l10n/hr/core.po
index 236b80b891da1ab21c360bb09adc912fea7f7edb..2959d09753c7705322b08f2d74d6ae084993ff34 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,59 +83,135 @@ msgstr "Nema odabranih kategorija za brisanje."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "nedelja"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "ponedeljak"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "utorak"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "srijeda"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Äetvrtak"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "petak"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "subota"
+
+#: js/config.php:33
+msgid "January"
+msgstr "SijeÄanj"
+
+#: js/config.php:33
+msgid "February"
+msgstr "VeljaÄa"
+
+#: js/config.php:33
+msgid "March"
+msgstr "OÅ¾ujak"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Travanj"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Svibanj"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Lipanj"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Srpanj"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Kolovoz"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Rujan"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Listopad"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Studeni"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Prosinac"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "juÄer"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "proÅ¡li mjesec"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "proÅ¡lu godinu"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "godina"
 
@@ -165,8 +241,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "PogreÅ¡ka"
 
@@ -178,123 +254,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "GreÅ¡ka prilikom djeljenja"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "GreÅ¡ka prilikom iskljuÄivanja djeljenja"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "GreÅ¡ka prilikom promjena prava"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Djeli sa"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Djeli preko link-a"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "ZaÅ¡titi lozinkom"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Postavi datum isteka"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Dijeli preko email-a:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Osobe nisu pronaÄ‘ene"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopuÅ¡teno"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "moÅ¾e mjenjat"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "kreiraj"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "aÅ¾uriraj"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "izbriÅ¡i"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "ZaÅ¡tita lozinkom"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "GreÅ¡ka prilikom brisanja datuma isteka"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "GreÅ¡ka prilikom postavljanja datuma isteka"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud resetiranje lozinke"
@@ -446,87 +540,11 @@ msgstr "PosluÅ¾itelj baze podataka"
 msgid "Finish setup"
 msgstr "ZavrÅ¡i postavljanje"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "nedelja"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "ponedeljak"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "utorak"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "srijeda"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Äetvrtak"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "petak"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "subota"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "SijeÄanj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "VeljaÄa"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "OÅ¾ujak"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Travanj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Svibanj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Lipanj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Srpanj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Kolovoz"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Rujan"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Listopad"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Studeni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Prosinac"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "web usluge pod vaÅ¡om kontrolom"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Odjava"
 
@@ -568,17 +586,3 @@ msgstr "sljedeÄ‡i"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index e69aea6cf78fe9183e2dd01e64077289ccd1d7bc..edf64baef15d8bb4c3e2e2b95a3173ca78df8dc8 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -34,46 +34,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je poslana uspjeÅ¡no i bez pogreÅ¡aka"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslana datoteka izlazi iz okvira MAX_FILE_SIZE direktive postavljene u HTML obrascu"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je poslana samo djelomiÄno"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ni jedna datoteka nije poslana"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena mapa"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Neuspjelo pisanje na disk"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -81,11 +81,11 @@ msgstr ""
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Prekini djeljenje"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "BriÅ¡i"
 
@@ -93,137 +93,151 @@ msgstr "BriÅ¡i"
 msgid "Rename"
 msgstr "Promjeni ime"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "predloÅ¾i ime"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generiranje ZIP datoteke, ovo moÅ¾e potrajati."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "PogreÅ¡ka pri slanju"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Zatvori"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 datoteka se uÄitava"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Slanje poniÅ¡teno."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "greÄka prilikom skeniranja"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Naziv"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "VeliÄina"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "PoÅ¡alji"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "datoteka za rukovanje"
@@ -272,36 +286,32 @@ msgstr "mapa"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "PoÅ¡alji"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Nema niÄega u ovoj mapi. PoÅ¡alji neÅ¡to!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo priÄekajte."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
diff --git a/l10n/hr/files_encryption.po b/l10n/hr/files_encryption.po
index d2734fd9fd2e73201c6776aa4d5a98684d143739..d284b96247279885f8efee9c8d512d12d5ced12e 100644
--- a/l10n/hr/files_encryption.po
+++ b/l10n/hr/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index 557b21178062a8dbcfa4d04e1b0859e1152186a5..0425c2dc5680098bd468e36e4949de992289788c 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index 80301078e43298af288527ebab9b4dbbd3317a69..28ed5873c3373ac8218f8c4811ee58e30a0535ba 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "PomoÄ‡"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Osobno"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Postavke"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "GreÅ¡ka kod autorizacije"
 
@@ -81,55 +85,55 @@ msgstr "Tekst"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "danas"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "juÄer"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "proÅ¡li mjesec"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "proÅ¡lu godinu"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "godina"
 
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 58d40e808931b299f8ca97234fa3ff7108aa07ec..a8be98c5afb21e587c6279355b9cc95938b0dd63 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "UkljuÄi"
 msgid "Saving..."
 msgstr "Spremanje..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -102,15 +102,15 @@ msgstr "Dodajte vaÅ¡u aplikaciju"
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Odaberite Aplikaciju"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Pogledajte stranicu s aplikacijama na apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Lozinka"
 
@@ -229,11 +229,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ime"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupe"
 
@@ -245,26 +245,30 @@ msgstr "Izradi"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "ostali"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupa Admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "ObriÅ¡i"
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 5861922d336e326c937e2374a57bbae5ab5d578f..25cb374e51ff6d994a526104849423bbde6ef59e 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "PomoÄ‡"
diff --git a/l10n/hr/user_webdavauth.po b/l10n/hr/user_webdavauth.po
index ec8c6a5f26ab30ac95b7f5b72d02596c60a1b9f1..d33ff57a3a1763eb0c235f91e4d2126b790f74f7 100644
--- a/l10n/hr/user_webdavauth.po
+++ b/l10n/hr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: hr\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr ""
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/hu/core.po b/l10n/hu/core.po
index e74a69fb8d01e537a1f81e6350ac39822da718ba..d2bfb48813ab4aa3f7e7b521d856d2dcd01116af 100644
--- a/l10n/hu/core.po
+++ b/l10n/hu/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -207,7 +207,6 @@ msgid "Password protect"
 msgstr ""
 
 #: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -564,17 +563,3 @@ msgstr ""
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/hu/files.po b/l10n/hu/files.po
index 4956069f94dbe33cb804e1d9805dc40629711e13..bcba12700245e24da4eb71b74e33b10f49d7e034 100644
--- a/l10n/hu/files.po
+++ b/l10n/hu/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:05+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:20
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:30
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:31
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:33
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:35
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:36
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:37
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:38
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
+#: ajax/upload.php:57
 msgid "Not enough space available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:91
 msgid "Invalid directory."
 msgstr ""
 
@@ -126,98 +131,100 @@ msgstr ""
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:48
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:53
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:62
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:242
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:242
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:259
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:298
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:486
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:559
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:565
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:775
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:783
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
 msgid "Name"
 msgstr ""
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
 msgid "Size"
 msgstr ""
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:829
+#: js/files.js:878
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:880
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:888
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:890
 msgid "{count} files"
 msgstr ""
 
@@ -269,10 +276,6 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
diff --git a/l10n/hu/files_versions.po b/l10n/hu/files_versions.po
index 8fb51cf6202310bdd23aafa2eb842ce90cf0da45..6f8e34c98c352f7313816d1bdbd30482936f229c 100644
--- a/l10n/hu/files_versions.po
+++ b/l10n/hu/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-01-03 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/hu/lib.po b/l10n/hu/lib.po
index 0dc080f7db02283695cf3d56821a38c3861251ca..dc349f094e9b51f62a92c09cf547abba3d9ba26d 100644
--- a/l10n/hu/lib.po
+++ b/l10n/hu/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-01-03 00:04+0100\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,27 +17,27 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr ""
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr ""
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr ""
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr ""
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
@@ -57,11 +57,15 @@ msgstr ""
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/hu/user_ldap.po b/l10n/hu/user_ldap.po
index e2abecc29af1792fd4a7d0cad18975640f384978..2c265cccc0ec6e245e95cadb82cc1881d7438c68 100644
--- a/l10n/hu/user_ldap.po
+++ b/l10n/hu/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-01-03 00:04+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/hu/user_webdavauth.po b/l10n/hu/user_webdavauth.po
index d6235e0472c2533e7061ad0cbed88234b74ba97d..87b7d322df844bec78049053b6c409004ffbca16 100644
--- a/l10n/hu/user_webdavauth.po
+++ b/l10n/hu/user_webdavauth.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-03 00:04+0100\n"
-"PO-Revision-Date: 2012-11-09 09:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-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"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/owncloud/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: hu\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/hu_HU/core.po b/l10n/hu_HU/core.po
index fa290171a2fe156c27abb1229b314f31cfd0ecf1..4a9be1afdf6060d1034f227b2cc80a2f118b0ed9 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -4,14 +4,16 @@
 # 
 # Translators:
 # Adam Toth <adazlord@gmail.com>, 2012.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
 #   <mail@tamas-nagy.net>, 2011.
 # Peter Borsa <peter.borsa@gmail.com>, 2012.
+# Tamas Nagy <mail@tamas-nagy.net>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -20,24 +22,24 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "%s felhasznÃ¡lÃ³ megosztott Ã–nnel egy fÃ¡jlt"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "%s felhasznÃ¡lÃ³ megosztott Ã–nnel egy mappÃ¡t"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +84,135 @@ 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/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "vasÃ¡rnap"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "hÃ©tfÅ‘"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "kedd"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "szerda"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "csÃ¼tÃ¶rtÃ¶k"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "pÃ©ntek"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "szombat"
+
+#: js/config.php:33
+msgid "January"
+msgstr "januÃ¡r"
+
+#: js/config.php:33
+msgid "February"
+msgstr "februÃ¡r"
+
+#: js/config.php:33
+msgid "March"
+msgstr "mÃ¡rcius"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Ã¡prilis"
+
+#: js/config.php:33
+msgid "May"
+msgstr "mÃ¡jus"
+
+#: js/config.php:33
+msgid "June"
+msgstr "jÃºnius"
+
+#: js/config.php:33
+msgid "July"
+msgstr "jÃºlius"
+
+#: js/config.php:33
+msgid "August"
+msgstr "augusztus"
+
+#: js/config.php:33
+msgid "September"
+msgstr "szeptember"
+
+#: js/config.php:33
+msgid "October"
+msgstr "oktÃ³ber"
+
+#: js/config.php:33
+msgid "November"
+msgstr "november"
+
+#: js/config.php:33
+msgid "December"
+msgstr "december"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "BeÃ¡llÃtÃ¡sok"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "pÃ¡r mÃ¡sodperce"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} perce"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 Ã³rÃ¡ja"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} Ã³rÃ¡ja"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} napja"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "mÃºlt hÃ³napban"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} hÃ³napja"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "tÃ¶bb hÃ³napja"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "tÃ¶bb Ã©ve"
 
@@ -164,8 +242,8 @@ msgid "The object type is not specified."
 msgstr "Az objektum tÃpusa nincs megadva."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Hiba"
 
@@ -177,123 +255,141 @@ msgstr "Az alkalmazÃ¡s neve nincs megadva."
 msgid "The required file {file} is not installed!"
 msgstr "A szÃ¼ksÃ©ges fÃ¡jl: {file} nincs telepÃtve!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Nem sikerÃ¼lt lÃ©trehozni a megosztÃ¡st"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Nem sikerÃ¼lt visszavonni a megosztÃ¡st"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Nem sikerÃ¼lt mÃ³dosÃtani a jogosultsÃ¡gokat"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Megosztotta Ã–nnel Ã©s a(z) {group} csoporttal: {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Megosztotta Ã–nnel: {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Kivel osztom meg"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Link megadÃ¡sÃ¡val osztom meg"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "JelszÃ³val is vÃ©dem"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
-msgstr "JelszÃ³ (tetszÅ‘leges)"
+msgstr "JelszÃ³"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Email cÃmre kÃ¼ldjÃ¼k el"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "KÃ¼ldjÃ¼k el"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Legyen lejÃ¡rati idÅ‘"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "A lejÃ¡rati idÅ‘"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "MegosztÃ¡s emaillel:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Nincs talÃ¡lat"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Ezt az Ã¡llomÃ¡nyt csak a tulajdonosa oszthatja meg mÃ¡sokkal"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Megosztva {item}-ben {user}-rel"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "A megosztÃ¡s visszavonÃ¡sa"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "mÃ³dosÃthat"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "jogosultsÃ¡g"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "lÃ©trehoz"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "szerkeszt"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "tÃ¶rÃ¶l"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "megoszt"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "JelszÃ³val van vÃ©dve"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Nem sikerÃ¼lt a lejÃ¡rati idÅ‘t tÃ¶rÃ¶lni"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Nem sikerÃ¼lt a lejÃ¡rati idÅ‘t beÃ¡llÃtani"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "KÃ¼ldÃ©s ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Az emailt elkÃ¼ldtÃ¼k"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud jelszÃ³-visszaÃ¡llÃtÃ¡s"
@@ -445,87 +541,11 @@ msgstr "AdatbÃ¡zis szerver"
 msgid "Finish setup"
 msgstr "A beÃ¡llÃtÃ¡sok befejezÃ©se"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "vasÃ¡rnap"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "hÃ©tfÅ‘"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "kedd"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "szerda"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "csÃ¼tÃ¶rtÃ¶k"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "pÃ©ntek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "szombat"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "januÃ¡r"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "februÃ¡r"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "mÃ¡rcius"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Ã¡prilis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "mÃ¡jus"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "jÃºnius"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "jÃºlius"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "augusztus"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "szeptember"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "oktÃ³ber"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "november"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "december"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "webszolgÃ¡ltatÃ¡sok sajÃ¡t kÃ©zben"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "KilÃ©pÃ©s"
 
@@ -566,18 +586,4 @@ msgstr "kÃ¶vetkezÅ‘"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "BiztonsÃ¡gi figyelmeztetÃ©s!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "KÃ©rjÃ¼k Ãrja be a jelszavÃ¡t! <br/>BiztonsÃ¡gi okokbÃ³l nÃ©ha a bejelentkezÃ©st kÃ¶vetÅ‘en is ellenÅ‘rzÃ©skÃ©ppen meg kell adnia a jelszavÃ¡t."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "EllenÅ‘rzÃ©s"
+msgstr "Owncloud frissÃtÃ©s a %s verziÃ³ra folyamatban. Kis tÃ¼relmet."
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index bf6a28272e19752e7a0c95610b2ccc5f09237020..d5983f639460df814454f4a45eac4b9cf7617c24 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -4,16 +4,19 @@
 # 
 # Translators:
 # Adam Toth <adazlord@gmail.com>, 2012.
+# Akos <nagy.akos@libreoffice.ro>, 2013.
+#  <gyonkibendeguz@gmail.com>, 2013.
 #   <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
 #   <mail@tamas-nagy.net>, 2011.
 # Peter Borsa <peter.borsa@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-29 00:04+0100\n"
+"PO-Revision-Date: 2013-01-28 08:37+0000\n"
+"Last-Translator: akoscomp <nagy.akos@libreoffice.ro>\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"
@@ -24,57 +27,57 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s Ã¡thelyezÃ©se nem sikerÃ¼lt - mÃ¡r lÃ©tezik mÃ¡sik fÃ¡jl ezzel a nÃ©vvel"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Nem sikerÃ¼lt %s Ã¡thelyezÃ©se"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Nem lehet Ã¡tnevezni a fÃ¡jlt"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Nem tÃ¶rtÃ©nt feltÃ¶ltÃ©s. Ismeretlen hiba"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "A fÃ¡jlt sikerÃ¼lt feltÃ¶lteni"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "A feltÃ¶ltÃ¶tt fÃ¡jl mÃ©rete meghaladja a php.ini Ã¡llomÃ¡nyban megadott upload_max_filesize paramÃ©ter Ã©rtÃ©kÃ©t."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "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:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Az eredeti fÃ¡jlt csak rÃ©szben sikerÃ¼lt feltÃ¶lteni."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Nem tÃ¶ltÅ‘dÃ¶tt fel semmi"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "HiÃ¡nyzik egy ideiglenes mappa"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Nem sikerÃ¼lt a lemezre tÃ¶rtÃ©nÅ‘ ÃrÃ¡s"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Nincs elÃ©g szabad hely"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Nincs elÃ©g szabad hely."
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Ã‰rvÃ©nytelen mappa."
 
@@ -82,11 +85,11 @@ msgstr "Ã‰rvÃ©nytelen mappa."
 msgid "Files"
 msgstr "FÃ¡jlok"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "MegosztÃ¡s visszavonÃ¡sa"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "TÃ¶rlÃ©s"
 
@@ -94,137 +97,151 @@ msgstr "TÃ¶rlÃ©s"
 msgid "Rename"
 msgstr "ÃtnevezÃ©s"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} mÃ¡r lÃ©tezik"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ãrjuk fÃ¶lÃ¼l"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "legyen mÃ¡s neve"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "mÃ©gse"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "a(z) {new_name} Ã¡llomÃ¡nyt kicserÃ©ltÃ¼k"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "visszavonÃ¡s"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} fÃ¡jlt kicserÃ©ltÃ¼k ezzel:  {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "{files} fÃ¡jl megosztÃ¡sa visszavonva"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} fÃ¡jl tÃ¶rÃ¶lve"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' fÃ¡jlnÃ©v Ã©rvÃ©nytelen."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "A fÃ¡jlnÃ©v nem lehet semmi."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ã‰rvÃ©nytelen elnevezÃ©s. Ezek a karakterek nem hasznÃ¡lhatÃ³k: '\\', '/', '<', '>', ':', '\"', '|', '?' Ã©s '*'"
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP-fÃ¡jl generÃ¡lÃ¡sa, ez eltarthat egy ideig."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "A tÃ¡rolÃ³ tele van, a fÃ¡jlok nem frissÃthetÅ‘ek vagy szinkronizÃ¡lhatÃ³ak a jÃ¶vÅ‘ben."
 
-#: js/files.js:224
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "A tÃ¡rolÃ³ majdnem tele van ({usedSpacePercent}%)"
+
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "FeltÃ¶ltÃ©si hiba"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "BezÃ¡rÃ¡s"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fÃ¡jl tÃ¶ltÅ‘dik fÃ¶l"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: 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:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "A feltÃ¶ltÃ©st megszakÃtottuk."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Az URL nem lehet semmi."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ã‰rvÃ©nytelen mappanÃ©v. A nÃ©v hasznÃ¡lata csak a Owncloud szÃ¡mÃ¡ra lehetsÃ©ges."
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} fÃ¡jlt talÃ¡ltunk"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Hiba a fÃ¡jllista-ellenÅ‘rzÃ©s sorÃ¡n"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "NÃ©v"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "MÃ©ret"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "MÃ³dosÃtva"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} mappa"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 fÃ¡jl"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} fÃ¡jl"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "FeltÃ¶ltÃ©s"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "FÃ¡jlkezelÃ©s"
@@ -273,36 +290,32 @@ msgstr "Mappa"
 msgid "From link"
 msgstr "FeltÃ¶ltÃ©s linkrÅ‘l"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "FeltÃ¶ltÃ©s"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "A feltÃ¶ltÃ©s megszakÃtÃ¡sa"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Itt nincs semmi. TÃ¶ltsÃ¶n fel valamit!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "LetÃ¶ltÃ©s"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "A feltÃ¶ltÃ©s tÃºl nagy"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "A fÃ¡jllista ellenÅ‘rzÃ©se zajlik, kis tÃ¼relmet!"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "EllenÅ‘rzÃ©s alatt"
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 896e96e2c7386e092e0dc019d3f5c5cbe1f1675c..1a15c06b6fe61c4533a94e48936321faa63582bc 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Akos <nagy.akos@libreoffice.ro>, 2013.
 # Csaba Orban <vicsabi@gmail.com>, 2012.
+#  <gyonkibendeguz@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 17:43+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-29 00:04+0100\n"
+"PO-Revision-Date: 2013-01-28 11:15+0000\n"
+"Last-Translator: akoscomp <nagy.akos@libreoffice.ro>\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,18 +20,66 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "KÃ©rjÃ¼k, hogy vÃ¡ltson Ã¡t az ownCloud kliensÃ©re, Ã©s vÃ¡ltoztassa meg a titkosÃtÃ¡si jelszÃ³t az Ã¡talakÃtÃ¡s befejezÃ©sÃ©hez."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "Ã¡tvÃ¡ltva a kliens oldalai titkosÃtÃ¡sra"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "TitkosÃtÃ¡si jelszÃ³ mÃ³dosÃtÃ¡sa a bejelentkezÃ©si jelszÃ³ra"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "KÃ©rjÃ¼k, ellenÅ‘rizze a jelszavait, Ã©s prÃ³bÃ¡lja meg Ãºjra."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Nem mÃ³dosÃthatja a fÃ¡jltitkosÃtÃ¡si jelszavÃ¡t a bejelentkezÃ©si jelszavÃ¡ra"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "VÃ¡lassza ki a titkosÃtÃ¡si mÃ³dot:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Kliens oldali titkosÃtÃ¡s (biztonsÃ¡gosabb, de lehetetlennÃ© teszi a fÃ¡jlok elÃ©rÃ©sÃ©t a bÃ¶ngÃ©szÅ‘bÅ‘l)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "KiszolgÃ¡lÃ³ oldali titkosÃtÃ¡s (lehetÅ‘vÃ© teszi a fÃ¡jlok elÃ©rÃ©sÃ©t Ãºgy bÃ¶ngÃ©szÅ‘bÅ‘l mint az asztali kliensbÅ‘l)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Semmi (semmilyen titkosÃtÃ¡s)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Fontos: Ha egyszer kivÃ¡lasztotta a titkosÃtÃ¡s mÃ³djÃ¡t, tÃ¶bbÃ© mÃ¡r nem lehet megvÃ¡ltoztatni"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "FelhasznÃ¡lÃ³ specifikus (a felhasznÃ¡lÃ³ vÃ¡laszthat)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "TitkosÃtÃ¡s"
 
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "A titkosÃtÃ¡s engedÃ©lyezÃ©se"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "A kÃ¶vetkezÅ‘ fÃ¡jltÃpusok kizÃ¡rÃ¡sa a titkosÃtÃ¡sbÃ³l"
 
-#: templates/settings.php:7
+#: templates/settings.php:71
 msgid "None"
 msgstr "Egyik sem"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "A kÃ¶vetkezÅ‘ fÃ¡jltÃpusok kizÃ¡rÃ¡sa a titkosÃtÃ¡sbÃ³l"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index 0a39722ad7f0c2a0960580f8db21794405cfd6f2..d5db4ac6033aa2edc448a7279bb93aa4a8228a82 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 17:24+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "Az Ã¶sszes korÃ¡bbi vÃ¡ltozat tÃ¶rlÃ©se"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "KorÃ¡bbi vÃ¡ltozatok"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Az Ã¡llomÃ¡nyok korÃ¡bbi vÃ¡ltozatai"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Itt tÃ¶rÃ¶lni tudja Ã¡llomÃ¡nyainak Ã¶sszes korÃ¡bbi verziÃ³jÃ¡t"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Az Ã¡llomÃ¡nyok verzionÃ¡lÃ¡sa"
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index 1a78f30958ae404d15f42e4a06facf93f2a3c3ea..c3c29798b139f1294e83af9f317ced661a3c9b80 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -4,12 +4,14 @@
 # 
 # Translators:
 # Adam Toth <adazlord@gmail.com>, 2012.
+#  <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 09:34+0000\n"
+"POT-Creation-Date: 2013-01-26 00:09+0100\n"
+"PO-Revision-Date: 2013-01-25 12:37+0000\n"
 "Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -18,33 +20,33 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "SÃºgÃ³"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "SzemÃ©lyes"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "BeÃ¡llÃtÃ¡sok"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "FelhasznÃ¡lÃ³k"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "AlkalmazÃ¡sok"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
 #: files.php:365
 msgid "ZIP download is turned off."
-msgstr "A ZIP-letÃ¶ltÃ©s nem engedÃ©lyezett."
+msgstr "A ZIP-letÃ¶ltÃ©s nincs engedÃ©lyezve."
 
 #: files.php:366
 msgid "Files need to be downloaded one by one."
@@ -56,13 +58,17 @@ msgstr "Vissza a FÃ¡jlokhoz"
 
 #: files.php:390
 msgid "Selected files too large to generate zip file."
-msgstr "A kivÃ¡lasztott fÃ¡jlok tÃºl nagy a zip tÃ¶mÃ¶rÃtÃ©shez."
+msgstr "A kivÃ¡lasztott fÃ¡jlok tÃºl nagyok a zip tÃ¶mÃ¶rÃtÃ©shez."
+
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "nem hatÃ¡rozhatÃ³ meg"
 
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Az alkalmazÃ¡s nincs engedÃ©lyezve"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "HitelesÃtÃ©si hiba"
 
@@ -82,55 +88,55 @@ msgstr "SzÃ¶veg"
 msgid "Images"
 msgstr "KÃ©pek"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "mÃ¡sodperce"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 perce"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d perce"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 Ã³rÃ¡ja"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d Ã³rÃ¡ja"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ma"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "tegnap"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d napja"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "mÃºlt hÃ³napban"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d hÃ³napja"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "tavaly"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ã©ve"
 
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 95751d84966ac4ef0ab1b4d7124616f73b3eef9a..5aa7fcfb013865c5f2e1663cdc804f8f59fcca06 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "EngedÃ©lyezÃ©s"
 msgid "Saving..."
 msgstr "MentÃ©s..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -102,15 +102,15 @@ msgstr "Az alkalmazÃ¡s hozzÃ¡adÃ¡sa"
 msgid "More Apps"
 msgstr "TovÃ¡bbi alkalmazÃ¡sok"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "VÃ¡lasszon egy alkalmazÃ¡st"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "LÃ¡sd apps.owncloud.com, alkalmazÃ¡sok oldal"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>"
 
@@ -159,7 +159,7 @@ msgstr "Android kliens letÃ¶ltÃ©se"
 msgid "Download iOS Client"
 msgstr "iOS kliens letÃ¶ltÃ©se"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "JelszÃ³"
 
@@ -229,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "NÃ©v"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Csoportok"
 
@@ -245,26 +245,30 @@ msgstr "LÃ©trehozÃ¡s"
 msgid "Default Storage"
 msgstr "AlapÃ©rtelmezett tÃ¡rhely"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "KorlÃ¡tlan"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "MÃ¡s"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "CsoportadminisztrÃ¡tor"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "TÃ¡rhely"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "AlapÃ©rtelmezett"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "TÃ¶rlÃ©s"
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 3e8274293c3ee93d08dec13b10ab43a63e62463c..8649648061463ec8e5df7376afcf8253adee6173 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <gyonkibendeguz@gmail.com>, 2013.
+# Laszlo Tornoci <torlasz@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-09 00:04+0100\n"
-"PO-Revision-Date: 2013-01-08 16:35+0000\n"
-"Last-Translator: gyeben <gyonkibendeguz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 15:57+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"
@@ -27,9 +28,9 @@ msgstr "<b>Figyelem:</b> a user_ldap Ã©s user_webdavauth alkalmazÃ¡sok nem kompa
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Figyelem:</b> a szÃ¼ksÃ©ges PHP LDAP modul nincs telepÃtve. EnÃ©lkÃ¼l az LDAP azonosÃtÃ¡s nem fog mÅ±kÃ¶dni. KÃ©rje meg a rendszergazdÃ¡t, hogy telepÃtse a szÃ¼ksÃ©ges modult!"
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>FigyelmeztetÃ©s:</b> Az LDAP PHP modul nincs telepÃtve, ezÃ©rt ez az alrendszer nem fog mÅ±kÃ¶dni. KÃ©rje meg a rendszergazdÃ¡t, hogy telepÃtse!"
 
 #: templates/settings.php:15
 msgid "Host"
@@ -44,6 +45,10 @@ msgstr "A protokoll elÅ‘tag elhagyhatÃ³, kivÃ©ve, ha SSL-t kÃvÃ¡n hasznÃ¡lni. E
 msgid "Base DN"
 msgstr "DN-gyÃ¶kÃ©r"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "SoronkÃ©nt egy DN-gyÃ¶kÃ©r"
+
 #: templates/settings.php:16
 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"
@@ -57,7 +62,7 @@ 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 "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:18
 msgid "Password"
@@ -115,10 +120,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "A felhasznÃ¡lÃ³i fa gyÃ¶kere"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "SoronkÃ©nt egy felhasznÃ¡lÃ³i fa gyÃ¶kerÃ©t adhatjuk meg"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "A csoportfa gyÃ¶kere"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "SoronkÃ©nt egy csoportfa gyÃ¶kerÃ©t adhatjuk meg"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "A csoporttagsÃ¡g attribÃºtuma"
diff --git a/l10n/hu_HU/user_webdavauth.po b/l10n/hu_HU/user_webdavauth.po
index 5d89219034f700712a3a27b482265ff6b3557767..f661c0e4ee09620d95371022845b7d1f85137f44 100644
--- a/l10n/hu_HU/user_webdavauth.po
+++ b/l10n/hu_HU/user_webdavauth.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Akos <nagy.akos@libreoffice.ro>, 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 20:47+0000\n"
-"Last-Translator: Laszlo Tornoci <torlasz@gmail.com>\n"
+"POT-Creation-Date: 2013-01-29 00:04+0100\n"
+"PO-Revision-Date: 2013-01-28 11:27+0000\n"
+"Last-Translator: akoscomp <nagy.akos@libreoffice.ro>\n"
 "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"
@@ -17,13 +18,17 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV hitelesÃtÃ©s"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "Az ownCloud rendszer erre a cÃmre fogja elkÃ¼ldeni a felhasznÃ¡lÃ³k bejelentkezÃ©si adatait. Ha 401-es vagy 403-as http kÃ³dot kap vissza, azt sikertelen azonosÃtÃ¡skÃ©nt fogja Ã©rtelmezni, minden mÃ¡s kÃ³dot sikeresnek fog tekinteni."
+"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 "Az ownCloud elkÃ¼ldi a felhasznÃ¡lÃ³i fiÃ³k adatai a kÃ¶vetkezÅ‘ URL-re. Ez a bÅ‘vÃtÅ‘modul leellenÅ‘rzi a vÃ¡laszt Ã©s ha a HTTP hibakÃ³d nem 401 vagy 403 azaz Ã©rvÃ©nytelen hitelesÃtÅ‘, akkor minden mÃ¡s vÃ¡lasz Ã©rvÃ©nyes lesz."
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 1973b2c0d963b4cc871cc4f4644065f0361fc7c1..0c74f32770057ef558adf85c8f63744994194d44 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Dominica"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Lunedi"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Martedi"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Mercuridi"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Jovedi"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Venerdi"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Sabbato"
+
+#: js/config.php:33
+msgid "January"
+msgstr "januario"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februario"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Martio"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Junio"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Julio"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Augusto"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Septembre"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Octobre"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembre"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Decembre"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr ""
 
@@ -175,123 +251,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Contrasigno"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "Reinitialisation del contrasigno de ownCLoud"
@@ -443,87 +537,11 @@ msgstr "Hospite de base de datos"
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Dominica"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Lunedi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Martedi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Mercuridi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Jovedi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Venerdi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Sabbato"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "januario"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februario"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Martio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Junio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Julio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Augusto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Septembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Octobre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Novembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Decembre"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Clauder le session"
 
@@ -565,17 +583,3 @@ msgstr "prox"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 48fee82947c298398042f04551e3210ac46cbbfd..b1a67c837771694f27aceffe5c58dfe56551d65f 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Le file incargate solmente esseva incargate partialmente"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Nulle file esseva incargate"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Manca un dossier temporari"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Files"
 msgstr "Files"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Deler"
 
@@ -92,137 +92,151 @@ msgstr "Deler"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Clauder"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nomine"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Incargar"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -271,36 +285,32 @@ msgstr "Dossier"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Incargar"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ia/files_encryption.po b/l10n/ia/files_encryption.po
index 8b85b14f5c1fbb0a5124bf529b95641277bb7fcc..bd7a38a6b19f8e3ccdfb6f58bfeefb4859ca7e5e 100644
--- a/l10n/ia/files_encryption.po
+++ b/l10n/ia/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index d0287f45ffffb9ff041ed17d2089735ac5516cce..7b2dbb7efe9340e819b6cb020aed4fc445cbae20 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index ac4ffabd499c1dc587ae63cc850073c0ddf9ed16..2e638284821b1c61c96ecef68aee4137473ab4bf 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Adjuta"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Configurationes"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Usatores"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr "Texto"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index f0ff993fa277bac226117117d744df300040c6f7..8a5f778dd980c716f0a6b5145d3da1b06992330a 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Interlingua"
 
@@ -101,15 +101,15 @@ msgstr "Adder tu application"
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selectionar un app"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -158,7 +158,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Contrasigno"
 
@@ -228,11 +228,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nomine"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Gruppos"
 
@@ -244,26 +244,30 @@ msgstr "Crear"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Altere"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Deler"
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index cae53dce37436c680db8f9fe5b938ef8dfb9bc27..6a131310437743ac7fa0f52e132832b27d98b9aa 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "Adjuta"
diff --git a/l10n/ia/user_webdavauth.po b/l10n/ia/user_webdavauth.po
index d14ab08ef72ae5df14bbde40f6a21c17bc537d82..cee575b438123314fd332bbe4482b13e3f9eca1a 100644
--- a/l10n/ia/user_webdavauth.po
+++ b/l10n/ia/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: ia\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/id/core.po b/l10n/id/core.po
index 4ae22894b17a286591e9776bad421e92578d9215..e3dcf88b98d31f1902f350a7859959a62e1d4f26 100644
--- a/l10n/id/core.po
+++ b/l10n/id/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,59 +83,135 @@ msgstr "Tidak ada kategori terpilih untuk penghapusan."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "minggu"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "senin"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "selasa"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "rabu"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "kamis"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "jumat"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "sabtu"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januari"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februari"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Maret"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mei"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Agustus"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Nopember"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Desember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 menit lalu"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -165,8 +241,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "gagal"
 
@@ -178,123 +254,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "gagal ketika membagikan"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "gagal ketika membatalkan pembagian"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "gagal ketika merubah perijinan"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "dibagikan dengan anda dan grup {group} oleh {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "dibagikan dengan anda oleh {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "bagikan dengan"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "bagikan dengan tautan"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "lindungi dengan kata kunci"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "set tanggal kadaluarsa"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "tanggal kadaluarsa"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "berbagi memlalui surel:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "tidak ada orang ditemukan"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "berbagi ulang tidak diperbolehkan"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "dibagikan dalam {item} dengan {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "batalkan berbagi"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "dapat merubah"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "kontrol akses"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "buat baru"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "baharui"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "hapus"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "dilindungi kata kunci"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "gagal melepas tanggal kadaluarsa"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "gagal memasang tanggal kadaluarsa"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "reset password ownCloud"
@@ -446,87 +540,11 @@ msgstr "Host database"
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "minggu"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "senin"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "selasa"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "rabu"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "kamis"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "jumat"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "sabtu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januari"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februari"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Maret"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mei"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Agustus"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Nopember"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Desember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Keluar"
 
@@ -568,17 +586,3 @@ msgstr "selanjutnya"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "peringatan keamanan!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "periksa kembali"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index cd2442d53bdb81df8b1ed6be7a251135711f920e..501136147160426eb6ff3d51485bc639014ba565 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -34,46 +34,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Tidak ada galat, berkas sukses diunggah"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Berkas hanya diunggah sebagian"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Tidak ada berkas yang diunggah"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Kehilangan folder temporer"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Gagal menulis ke disk"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -81,11 +81,11 @@ msgstr ""
 msgid "Files"
 msgstr "Berkas"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "batalkan berbagi"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Hapus"
 
@@ -93,137 +93,151 @@ msgstr "Hapus"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "mengganti"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "batal dikerjakan"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "membuat berkas ZIP, ini mungkin memakan waktu."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Terjadi Galat Pengunggahan"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "tutup"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "tautan tidak boleh kosong"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nama"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Unggah"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Penanganan berkas"
@@ -272,36 +286,32 @@ msgstr "Folder"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Unggah"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Batal mengunggah"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Unggahan terlalu besar"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silahkan tunggu."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Sedang memindai"
diff --git a/l10n/id/files_encryption.po b/l10n/id/files_encryption.po
index 5ab924354cbc2440169f1a73eae44d1ebf8f6f92..d6d66e61e0752c9308901a339e9a56c5b66a74fc 100644
--- a/l10n/id/files_encryption.po
+++ b/l10n/id/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 23:08+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "enkripsi"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "pengecualian untuk tipe file berikut dari enkripsi"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "tidak ada"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "aktifkan enkripsi"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 5b9201c347e79240d06eb1c8c5dcadc45c5a6d27..7b9d5d187457911fbda08084b22ddfe7fde89fd9 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/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: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 23:40+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "kadaluarsakan semua versi"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "riwayat"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "versi"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "ini akan menghapus semua versi backup yang ada dari file anda"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "pembuatan versi file"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index ce05e57c124522fe4a427c770113ade068438cc5..013ed9d846ca493767439613426a65c47590ce8d 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.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-14 00:17+0100\n"
-"PO-Revision-Date: 2013-01-13 01:26+0000\n"
-"Last-Translator: Mohamad Hasan Al Banna <se7entime@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,11 +59,15 @@ msgstr "kembali ke daftar file"
 msgid "Selected files too large to generate zip file."
 msgstr "file yang dipilih terlalu besar untuk membuat file zip"
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "aplikasi tidak diaktifkan"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "autentikasi bermasalah"
 
@@ -83,55 +87,55 @@ msgstr "teks"
 msgid "Images"
 msgstr "Gambar"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 menit lalu"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d menit lalu"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 jam yang lalu"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d jam yang lalu"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hari ini"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "kemarin"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d hari lalu"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d bulan yang lalu"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 72ad4e872a764e2764a0e1a00410cd71582c9ae2..bcaf1c7afee57170d0e9ea889d5717b831f18e1a 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "Aktifkan"
 msgid "Saving..."
 msgstr "Menyimpan..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -103,15 +103,15 @@ msgstr "Tambahkan App anda"
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Pilih satu aplikasi"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Password"
 
@@ -230,11 +230,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nama"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Group"
 
@@ -246,26 +246,30 @@ msgstr "Buat"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Lain-lain"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Admin Grup"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Hapus"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 193df390395814ecd9b27adf9daa544fdb5e4d9f..d1b6b34abf187c5b3d97a341854cd749a4adff74 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr "port"
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/id/user_webdavauth.po b/l10n/id/user_webdavauth.po
index fc5b698ce728acbb15be847cb95df0ebad22701c..409d046d03efc960f1deab453662c63398163c25 100644
--- a/l10n/id/user_webdavauth.po
+++ b/l10n/id/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: id\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/is/core.po b/l10n/is/core.po
index d07f7133071f4544bedb573e0d417bfb9ee72b7d..4916011fc439f490f13c72e3a3c4fad3e7fd0a70 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Notandinn %s deildi skrÃ¡ meÃ° Ã¾Ã©r"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Notandinn %s deildi mÃ¶ppu meÃ° Ã¾Ã©r"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "Notandinn %s deildi skrÃ¡nni \"%s\" meÃ° Ã¾Ã©r. HÃ¦gt er aÃ° hlaÃ°a henni niÃ°ur hÃ©r: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,59 +81,135 @@ msgstr "Enginn flokkur valinn til eyÃ°ingar."
 msgid "Error removing %s from favorites."
 msgstr "Villa viÃ° aÃ° fjarlÃ¦gja %s Ãºr eftirlÃ¦ti."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Sunnudagur"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "MÃ¡nudagur"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "ÃžriÃ°judagur"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "MiÃ°vikudagur"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Fimmtudagur"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "FÃ¶studagur"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Laugardagur"
+
+#: js/config.php:33
+msgid "January"
+msgstr "JanÃºar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "FebrÃºar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Mars"
+
+#: js/config.php:33
+msgid "April"
+msgstr "AprÃl"
+
+#: js/config.php:33
+msgid "May"
+msgstr "MaÃ"
+
+#: js/config.php:33
+msgid "June"
+msgstr "JÃºnÃ"
+
+#: js/config.php:33
+msgid "July"
+msgstr "JÃºlÃ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "ÃgÃºst"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "OktÃ³ber"
+
+#: js/config.php:33
+msgid "November"
+msgstr "NÃ³vember"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Desember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Stillingar"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sek sÃÃ°an"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 min sÃÃ°an"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} min sÃÃ°an"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Fyrir 1 klst."
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "fyrir {hours} klst."
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Ã dag"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ã gÃ¦r"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} dagar sÃÃ°an"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "sÃÃ°asta mÃ¡nuÃ°i"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "fyrir {months} mÃ¡nuÃ°um"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "mÃ¡nuÃ°ir sÃÃ°an"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "sÃÃ°asta Ã¡ri"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ã¡rum sÃÃ°an"
 
@@ -163,8 +239,8 @@ msgid "The object type is not specified."
 msgstr "Tegund ekki tilgreind"
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Villa"
 
@@ -176,123 +252,141 @@ msgstr "Nafn forrits ekki tilgreint"
 msgid "The required file {file} is not installed!"
 msgstr "UmbeÃ°ina skrÃ¡in {file} ekki tiltÃ¦k!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Villa viÃ° deilingu"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Villa viÃ° aÃ° hÃ¦tta deilingu"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Villa viÃ° aÃ° breyta aÃ°gangsheimildum"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Deilt meÃ° Ã¾Ã©r og hÃ³pnum {group} af {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Deilt meÃ° Ã¾Ã©r af {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Deila meÃ°"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Deila meÃ° veftengli"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Verja meÃ° lykilorÃ°i"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "LykilorÃ°"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Senda vefhlekk Ã tÃ¶lvupÃ³stu til notenda"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Senda"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Setja gildistÃma"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Gildir til"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Deila meÃ° tÃ¶lvupÃ³sti:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Engir notendur fundust"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Endurdeiling er ekki leyfÃ°"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Deilt meÃ° {item} Ã¡samt {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "HÃ¦tta deilingu"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "getur breytt"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "aÃ°gangsstÃ½ring"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "mynda"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "uppfÃ¦ra"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "eyÃ°a"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "deila"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Verja meÃ° lykilorÃ°i"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Villa viÃ° aÃ° aftengja gildistÃma"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Villa viÃ° aÃ° setja gildistÃma"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Sendi ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "TÃ¶lvupÃ³stur sendur"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "endursetja ownCloud lykilorÃ°"
@@ -444,87 +538,11 @@ msgstr "NetÃ¾jÃ³nn gagnagrunns"
 msgid "Finish setup"
 msgstr "Virkja uppsetningu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Sunnudagur"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "MÃ¡nudagur"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "ÃžriÃ°judagur"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "MiÃ°vikudagur"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Fimmtudagur"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "FÃ¶studagur"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Laugardagur"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "JanÃºar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "FebrÃºar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Mars"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "AprÃl"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "MaÃ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "JÃºnÃ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "JÃºlÃ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "ÃgÃºst"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "OktÃ³ber"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "NÃ³vember"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Desember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "vefÃ¾jÃ³nusta undir Ã¾inni stjÃ³rn"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "ÃštskrÃ¡"
 
@@ -566,17 +584,3 @@ msgstr "nÃ¦sta"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "UppfÃ¦ri ownCloud Ã ÃºtgÃ¡fu %s, Ã¾aÃ° gÃ¦ti tekiÃ° smÃ¡ stund."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Ã–ryggis aÃ°vÃ¶run!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Vinsamlegast staÃ°festu lykilorÃ°iÃ° Ã¾itt.<br/>Ã Ã¶ryggisskyni munum viÃ° biÃ°ja Ã¾ig um aÃ° skipta um lykilorÃ° af og til."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "StaÃ°festa"
diff --git a/l10n/is/files.po b/l10n/is/files.po
index f1c7c6d6dd1773d008820ae794dc3b9ef3f51118..bd387e20c3fe049d359455417ca71c881e2643d9 100644
--- a/l10n/is/files.po
+++ b/l10n/is/files.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-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 22:46+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -32,46 +32,46 @@ msgstr "Gat ekki fÃ¦rt %s"
 msgid "Unable to rename file"
 msgstr "Gat ekki endurskÃ½rt skrÃ¡"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Engin skrÃ¡ var send inn. Ã“Ã¾ekkt villa."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Engin villa, innsending heppnaÃ°ist"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Innsend skrÃ¡ er stÃ¦rri en upload_max stillingin Ã php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Innsenda skrÃ¡in er stÃ¦rri en MAX_FILE_SIZE sem skilgreint er Ã HTML sniÃ°inu."
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Einungis hluti af innsendri skrÃ¡ skilaÃ°i sÃ©r"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Engin skrÃ¡ skilaÃ°i sÃ©r"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Vantar brÃ¡Ã°abirgÃ°amÃ¶ppu"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "TÃ³kst ekki aÃ° skrifa Ã¡ disk"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Ekki nÃ¦gt plÃ¡ss tiltÃ¦kt"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Ã“gild mappa."
 
@@ -79,11 +79,11 @@ msgstr "Ã“gild mappa."
 msgid "Files"
 msgstr "SkrÃ¡r"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "HÃ¦tta deilingu"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "EyÃ°a"
 
@@ -91,137 +91,151 @@ msgstr "EyÃ°a"
 msgid "Rename"
 msgstr "EndurskÃ½ra"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} er Ã¾egar til"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "yfirskrifa"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "stinga upp Ã¡ nafni"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "hÃ¦tta viÃ°"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "endurskÃ½rÃ°i {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "afturkalla"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "yfirskrifaÃ°i {new_name} meÃ° {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "HÃ¦tti viÃ° deilingu Ã¡ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "eyddi {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' er ekki leyfilegt nafn."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Nafn skrÃ¡ar mÃ¡ ekki vera tÃ³mt"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ã“gilt nafn, tÃ¡knin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfÃ°."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "bÃ½ til ZIP skrÃ¡, Ã¾aÃ° gÃ¦ti tekiÃ° smÃ¡ stund."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Villa viÃ° innsendingu"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Loka"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "BÃÃ°ur"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 skrÃ¡ innsend"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} skrÃ¡r innsendar"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "HÃ¦tt viÃ° innsendingu."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "VefslÃ³Ã° mÃ¡ ekki vera tÃ³m."
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} skrÃ¡r skimaÃ°ar"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "villa viÃ° skimun"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nafn"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "StÃ¦rÃ°"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Breytt"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 mappa"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} mÃ¶ppur"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 skrÃ¡"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} skrÃ¡r"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Senda inn"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "MeÃ°hÃ¶ndlun skrÃ¡r"
@@ -270,36 +284,32 @@ msgstr "Mappa"
 msgid "From link"
 msgstr "Af tengli"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Senda inn"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "HÃ¦tta viÃ° innsendingu"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ekkert hÃ©r. Settu eitthvaÃ° inn!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "NiÃ°urhal"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Innsend skrÃ¡ er of stÃ³r"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "VeriÃ° er aÃ° skima skrÃ¡r, vinsamlegast hinkraÃ°u."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Er aÃ° skima"
diff --git a/l10n/is/files_encryption.po b/l10n/is/files_encryption.po
index 3dfd91e61aba193c1bd8ea0207c03e66ce94d374..b46b5ff3c18ed0d48b3547fd9955f3387d761aa3 100644
--- a/l10n/is/files_encryption.po
+++ b/l10n/is/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 19:56+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "DulkÃ³Ã°un"
 
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "Virkja dulkÃ³Ã°un"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "Undanskilja eftirfarandi skrÃ¡artegundir frÃ¡ dulkÃ³Ã°un"
 
-#: templates/settings.php:7
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ekkert"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "Undanskilja eftirfarandi skrÃ¡artegundir frÃ¡ dulkÃ³Ã°un"
diff --git a/l10n/is/files_versions.po b/l10n/is/files_versions.po
index bc2e72de5752ac369c6a242541e81b2de09fcca8..1a0acfa5b88979c703ba22767fd95e41f23287d0 100644
--- a/l10n/is/files_versions.po
+++ b/l10n/is/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: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 17:42+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "Ãšrelda allar ÃºtgÃ¡fur"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Saga"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "ÃštgÃ¡fur"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Ãžetta mun eyÃ°a Ã¶llum afritum af skrÃ¡num Ã¾Ãnum"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "ÃštgÃ¡fur af skrÃ¡m"
diff --git a/l10n/is/lib.po b/l10n/is/lib.po
index 0e7cb4618736cc09db2acc4ebd16f00ce5a94bc2..e6b54f855f2462f30a50667767b48cdb9e6e4ad4 100644
--- a/l10n/is/lib.po
+++ b/l10n/is/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: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 15:15+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +18,27 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "HjÃ¡lp"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "Um mig"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "Stillingar"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Notendur"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "Forrit"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "StjÃ³rnun"
 
@@ -58,11 +58,15 @@ msgstr "Aftur Ã skrÃ¡r"
 msgid "Selected files too large to generate zip file."
 msgstr "Valdar skrÃ¡r eru of stÃ³rar til aÃ° bÃºa til ZIP skrÃ¡."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Forrit ekki virkt"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Villa viÃ° auÃ°kenningu"
 
@@ -82,55 +86,55 @@ msgstr "Texti"
 msgid "Images"
 msgstr "Myndir"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sek."
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "Fyrir 1 mÃnÃºtu"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "fyrir %d mÃnÃºtum"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Fyrir 1 klst."
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "fyrir %d klst."
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Ã dag"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ã gÃ¦r"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "fyrir %d dÃ¶gum"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "sÃÃ°asta mÃ¡nuÃ°i"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "fyrir %d mÃ¡nuÃ°um"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "sÃÃ°asta Ã¡ri"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "einhverjum Ã¡rum"
 
diff --git a/l10n/is/settings.po b/l10n/is/settings.po
index 0c0579cec5d771683af9d6af8e6a6691f2ffde08..15f488a9b267650b5e9207119050795b9538d19a 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "Virkja"
 msgid "Saving..."
 msgstr "Er aÃ° vista ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__nafn_tungumÃ¡ls__"
 
@@ -100,15 +100,15 @@ msgstr "BÃ¦ta viÃ° forriti"
 msgid "More Apps"
 msgstr "Fleiri forrit"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Veldu forrit"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "SkoÃ°a sÃÃ°u forrits hjÃ¡ apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-leyfi skrÃ¡Ã° af <span class=\"author\"></span>"
 
@@ -157,7 +157,7 @@ msgstr "HlaÃ°a niÃ°ur Andoid hugbÃºnaÃ°i"
 msgid "Download iOS Client"
 msgstr "HlaÃ°a niÃ°ur iOS hugbÃºnaÃ°i"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "LykilorÃ°"
 
@@ -227,11 +227,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nafn"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "HÃ³par"
 
@@ -243,26 +243,30 @@ msgstr "BÃºa til"
 msgid "Default Storage"
 msgstr "SjÃ¡lfgefin gagnageymsla"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ã“takmarkaÃ°"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "AnnaÃ°"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "HÃ³pstjÃ³ri"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "gagnaplÃ¡ss"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "SjÃ¡lfgefiÃ°"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "EyÃ°a"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 828b0b2693acef78a14e0f64a42372146ef0c70a..98dfe70c84e050dddd7b00fff6003cb3035406d2 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/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: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 19:00+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/is/user_webdavauth.po b/l10n/is/user_webdavauth.po
index 859ebae1986c795c4f0a4469a1ce908d0eaf8559..8bf055721845f4840753adee06f1cab83c2cae5d 100644
--- a/l10n/is/user_webdavauth.po
+++ b/l10n/is/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-31 00:04+0100\n"
-"PO-Revision-Date: 2012-12-30 21:13+0000\n"
-"Last-Translator: sveinn <sveinng@gmail.com>\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"
 "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,13 +18,17 @@ msgstr ""
 "Language: is\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 "VefslÃ³Ã°: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud mun senda auÃ°kenni notenda Ã¡ Ã¾essa vefslÃ³Ã° og tÃºkla svÃ¶rin http 401 og http 403 sem rangar auÃ°kenniupplÃ½singar og Ã¶ll Ã¶nnur svÃ¶r sem rÃ©tt."
+"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/it/core.po b/l10n/it/core.po
index 9191a81e2d26cdc08d7b1158d599cc7b68dd68c5..77ec770b0d56143187909b81380498a993506d62 100644
--- a/l10n/it/core.po
+++ b/l10n/it/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+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"
@@ -22,24 +22,24 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "L'utente %s ha condiviso un file con te"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "L'utente %s ha condiviso una cartella con te"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "L'utente %s ha condiviso il file \"%s\" con te. Ãˆ disponibile per lo scaricamento qui: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -84,59 +84,135 @@ msgstr "Nessuna categoria selezionata per l'eliminazione."
 msgid "Error removing %s from favorites."
 msgstr "Errore durante la rimozione di %s dai preferiti."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Domenica"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "LunedÃ¬"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "MartedÃ¬"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "MercoledÃ¬"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "GiovedÃ¬"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "VenerdÃ¬"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Sabato"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Gennaio"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Febbraio"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Marzo"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Aprile"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maggio"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Giugno"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Luglio"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Agosto"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Settembre"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Ottobre"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembre"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Dicembre"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "Un minuto fa"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuti fa"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 ora fa"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} ore fa"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "oggi"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} giorni fa"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "mese scorso"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} mesi fa"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "mesi fa"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "anno scorso"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "anni fa"
 
@@ -166,8 +242,8 @@ msgid "The object type is not specified."
 msgstr "Il tipo di oggetto non Ã¨ specificato."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Errore"
 
@@ -179,123 +255,141 @@ msgstr "Il nome dell'applicazione non Ã¨ specificato."
 msgid "The required file {file} is not installed!"
 msgstr "Il file richiesto {file} non Ã¨ installato!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Errore durante la rimozione della condivisione"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Errore durante la modifica dei permessi"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Condiviso con te e con il gruppo {group} da {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Condiviso con te da {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Condividi con"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Condividi con collegamento"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Password"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Invia collegamento via email"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Invia"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Imposta data di scadenza"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Condividi tramite email:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non Ã¨ consentita"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "puÃ² modificare"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "eliminare"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "condividere"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Invio in corso..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Messaggio inviato"
 
+#: 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 "L'aggiornamento non Ã¨ riuscito. Segnala il problema alla <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">comunitÃ  di ownCloud</a>."
+
+#: js/update.js:18
+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
 msgid "ownCloud password reset"
 msgstr "Ripristino password di ownCloud"
@@ -447,87 +541,11 @@ msgstr "Host del database"
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Domenica"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "LunedÃ¬"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "MartedÃ¬"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "MercoledÃ¬"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "GiovedÃ¬"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "VenerdÃ¬"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Sabato"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Gennaio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Febbraio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Marzo"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Aprile"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maggio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Giugno"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Luglio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Agosto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Settembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Ottobre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Novembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Dicembre"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Esci"
 
@@ -569,17 +587,3 @@ msgstr "successivo"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Aggiornamento di ownCloud alla versione %s in corso, potrebbe richiedere del tempo."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Avviso di sicurezza"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Verifica la tua password.<br/>Per motivi di sicurezza, potresti ricevere una richiesta di digitare nuovamente la password."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifica"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 89db9dc1bd9cd06a561fa1e0fb6781ff55b9a50c..0a161d8c6e382287b9d82269051025a071e891c6 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-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 06:53+0000\n"
+"POT-Creation-Date: 2013-01-28 00:04+0100\n"
+"PO-Revision-Date: 2013-01-27 00:03+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"
@@ -35,46 +35,46 @@ msgstr "Impossibile spostare %s"
 msgid "Unable to rename file"
 msgstr "Impossibile rinominare il file"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file Ã¨ stato inviato. Errore sconosciuto"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Non ci sono errori, file caricato con successo"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Il file caricato supera la direttiva upload_max_filesize in php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Il file caricato supera il valore MAX_FILE_SIZE definito nel form HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Il file Ã¨ stato parzialmente caricato"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Nessun file Ã¨ stato caricato"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Cartella temporanea mancante"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Scrittura su disco non riuscita"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Spazio disponibile insufficiente"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Spazio di archiviazione insufficiente"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Cartella non valida."
 
@@ -82,11 +82,11 @@ msgstr "Cartella non valida."
 msgid "Files"
 msgstr "File"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Elimina"
 
@@ -94,137 +94,151 @@ msgstr "Elimina"
 msgid "Rename"
 msgstr "Rinomina"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} esiste giÃ "
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "suggerisci nome"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "sostituito {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "sostituito {new_name} con {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "non condivisi {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "eliminati {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' non Ã¨ un nome file valido."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Il nome del file non puÃ² essere vuoto."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "creazione file ZIP, potrebbe richiedere del tempo."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Lo spazio di archiviazione Ã¨ pieno, i file non possono essere piÃ¹ aggiornati o sincronizzati!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Lo spazio di archiviazione Ã¨ quasi pieno ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Errore di invio"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Chiudi"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "In corso"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 file in fase di caricamento"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: 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:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "L'URL non puÃ² essere vuoto."
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} file analizzati"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "errore durante la scansione"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 cartella"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} cartelle"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 file"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} file"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Carica"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Gestione file"
@@ -273,36 +287,32 @@ msgstr "Cartella"
 msgid "From link"
 msgstr "Da collegamento"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Carica"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'Ã¨ niente qui. Carica qualcosa!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Il file caricato Ã¨ troppo grande"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Scansione corrente"
diff --git a/l10n/it/files_encryption.po b/l10n/it/files_encryption.po
index 573a32a14a50439c4d3a16e1dd8af916bb5b5c86..544caf9fd79831e2c0a3faf9fdc614924a2741db 100644
--- a/l10n/it/files_encryption.po
+++ b/l10n/it/files_encryption.po
@@ -3,33 +3,81 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# 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-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 11:49+0000\n"
+"POT-Creation-Date: 2013-01-28 00:04+0100\n"
+"PO-Revision-Date: 2013-01-27 19:44+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Passa al tuo client ownCloud e cambia la password di cifratura per completare la conversione."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "passato alla cifratura lato client"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Converti la password di cifratura nella password di accesso"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Controlla la password e prova ancora."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Impossibile convertire la password di cifratura nella password di accesso"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Scegli la modalitÃ  di cifratura."
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Cifratura lato client (piÃ¹ sicura ma rende impossibile accedere ai propri dati dall'interfaccia web)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "Cifratura lato server (ti consente di accedere ai tuoi file dall'interfaccia web e dal client desktop)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Nessuna (senza alcuna cifratura)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Importante: una volta selezionata la modalitÃ  di cifratura non sarÃ  possibile tornare indietro"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "Specificato dall'utente (lascia decidere all'utente)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Escludi i seguenti tipi di file dalla cifratura"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Nessuna"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Abilita cifratura"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 273bdef29b069b1f70b8c85ecbe10c9285c40aaa..5bb90cec909834d944dd1671096387b729c4d82b 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/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: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 06:40+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\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"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Scadenza di tutte le versioni"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Cronologia"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versioni"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "CiÃ² eliminerÃ  tutte le versioni esistenti dei tuoi file"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Controllo di versione dei file"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index 093eca463d15c92df299c1dc0b90561068dc7b82..e162e94ad32ffd6b34cf425f90eeaf8f3ea81fb9 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+# 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-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-15 23:21+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 06:44+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,51 +18,55 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Aiuto"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Utenti"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Applicazioni"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP Ã¨ stato disabilitato."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "non puÃ² essere determinato"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "L'applicazione  non Ã¨ abilitata"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Errore di autenticazione"
 
@@ -82,55 +86,55 @@ msgstr "Testo"
 msgid "Images"
 msgstr "Immagini"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "secondi fa"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minuto fa"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuti fa"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 ora fa"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ore fa"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "oggi"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "ieri"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d giorni fa"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "il mese scorso"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d mesi fa"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "l'anno scorso"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "anni fa"
 
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 95df71ce1948518ed43d3dbd6d67d4bab773af2f..6f1b11dd3f299544d134f7f731375447e53923ff 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -7,15 +7,15 @@
 # Francesco Apruzzese <cescoap@gmail.com>, 2011.
 #   <icewind1991@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
-#   <marco@carnazzo.it>, 2011, 2012.
+#   <marco@carnazzo.it>, 2011-2013.
 #   <rb.colombo@gmail.com>, 2011.
 # Vincenzo Reale <vinx.reale@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+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"
@@ -94,7 +94,7 @@ msgstr "Abilita"
 msgid "Saving..."
 msgstr "Salvataggio in corso..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Italiano"
 
@@ -106,15 +106,15 @@ msgstr "Aggiungi la tua applicazione"
 msgid "More Apps"
 msgstr "Altre applicazioni"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Seleziona un'applicazione"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>"
 
@@ -163,7 +163,7 @@ msgstr "Scarica client Android"
 msgid "Download iOS Client"
 msgstr "Scarica client iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Password"
 
@@ -233,11 +233,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitÃ  di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> Ã¨ 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>."
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nome"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Gruppi"
 
@@ -249,26 +249,30 @@ msgstr "Crea"
 msgid "Default Storage"
 msgstr "Archiviazione predefinita"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Illimitata"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Altro"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
-msgstr "Gruppo di amministrazione"
+msgstr "Gruppi amministrati"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Archiviazione"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Predefinito"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Elimina"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 9dc0007050a6ce422685dce8a28eb5f158f89035..5c009d82967b3af537e29aa98218192ba5cad6d3 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.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-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 10:28+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 08:29+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -28,9 +28,9 @@ msgstr "<b>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompat
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Avviso:</b> il modulo PHP LDAP richiesto non Ã¨ installato, il motore non funzionerÃ . Chiedi al tuo amministratore di sistema di installarlo."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Avviso:</b> il modulo PHP LDAP non Ã¨ installato, il motore non funzionerÃ . Chiedi al tuo amministratore di sistema di installarlo."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -45,6 +45,10 @@ msgstr "Ãˆ possibile omettere il protocollo, ad eccezione se Ã¨ necessario SSL.
 msgid "Base DN"
 msgstr "DN base"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Un DN base per riga"
+
 #: templates/settings.php:16
 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"
@@ -116,10 +120,18 @@ msgstr "Porta"
 msgid "Base User Tree"
 msgstr "Struttura base dell'utente"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Un DN base utente per riga"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Struttura base del gruppo"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Un DN base gruppo per riga"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Associazione gruppo-utente "
diff --git a/l10n/it/user_webdavauth.po b/l10n/it/user_webdavauth.po
index 074902ec72498856ff1dcf246dd775ea6e831464..ba6bfbe7d44cfc720d07e631f2a32edb3ea46f05 100644
--- a/l10n/it/user_webdavauth.po
+++ b/l10n/it/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Vincenzo Reale <vinx.reale@gmail.com>, 2012.
+# 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-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-21 08:45+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 06: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,13 +18,17 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Autenticazione WebDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud invierÃ  le credenziali dell'utente a questo URL. Interpreta i codici http 401 e http 403 come credenziali errate e tutti gli altri codici come credenziali corrette."
+"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 invierÃ  le credenziali dell'utente a questo URL. Questa estensione controlla la risposta e interpreta i codici di stato 401 e 403 come credenziali non valide, e tutte le altre risposte come credenziali valide."
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 5915df8dc20a9829a613763550bd2499edd9ff55..76db5f78f9b5fd6dc2d5e573dfb856659c5ae2b5 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ãƒ¦ãƒ¼ã‚¶ %s ã¯ã‚ãªãŸã¨ãƒ•ã‚¡ã‚¤ãƒ«ã‚’å…±æœ‰ã—ã¦ã„ã¾ã™"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ãƒ¦ãƒ¼ã‚¶ %s ã¯ã‚ãªãŸã¨ãƒ•ã‚©ãƒ«ãƒ€ã‚’å…±æœ‰ã—ã¦ã„ã¾ã™"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +82,135 @@ msgstr "å‰Šé™¤ã™ã‚‹ã‚«ãƒ†ã‚´ãƒªãŒé¸æŠžã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
 msgid "Error removing %s from favorites."
 msgstr "ãŠæ°—ã«å…¥ã‚Šã‹ã‚‰ %s ã®å‰Šé™¤ã‚¨ãƒ©ãƒ¼"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "æ—¥"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "æœˆ"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "ç«"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "æ°´"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "æœ¨"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "é‡‘"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "åœŸ"
+
+#: js/config.php:33
+msgid "January"
+msgstr "1æœˆ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "2æœˆ"
+
+#: js/config.php:33
+msgid "March"
+msgstr "3æœˆ"
+
+#: js/config.php:33
+msgid "April"
+msgstr "4æœˆ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "5æœˆ"
+
+#: js/config.php:33
+msgid "June"
+msgstr "6æœˆ"
+
+#: js/config.php:33
+msgid "July"
+msgstr "7æœˆ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "8æœˆ"
+
+#: js/config.php:33
+msgid "September"
+msgstr "9æœˆ"
+
+#: js/config.php:33
+msgid "October"
+msgstr "10æœˆ"
+
+#: js/config.php:33
+msgid "November"
+msgstr "11æœˆ"
+
+#: js/config.php:33
+msgid "December"
+msgstr "12æœˆ"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 åˆ†å‰"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} åˆ†å‰"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 æ™‚é–“å‰"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} æ™‚é–“å‰"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ä»Šæ—¥"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "æ˜¨æ—¥"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} æ—¥å‰"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "ä¸€æœˆå‰"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} æœˆå‰"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "ä¸€å¹´å‰"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "å¹´å‰"
 
@@ -164,8 +240,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "ã‚¨ãƒ©ãƒ¼"
 
@@ -177,123 +253,141 @@ msgstr "ã‚¢ãƒ—ãƒªåãŒã—ã¦ã„ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚"
 msgid "The required file {file} is not installed!"
 msgstr "å¿…è¦ãªãƒ•ã‚¡ã‚¤ãƒ« {file} ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ï¼"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "å…±æœ‰ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "å…±æœ‰è§£é™¤ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "æ¨©é™å¤‰æ›´ã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ã‚ãªãŸã¨ {owner} ã®ã‚°ãƒ«ãƒ¼ãƒ— {group} ã§å…±æœ‰ä¸"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "{owner} ã¨å…±æœ‰ä¸"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "å…±æœ‰è€…"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "URLãƒªãƒ³ã‚¯ã§å…±æœ‰"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ä¿è·"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "ãƒ¡ãƒ¼ãƒ«ãƒªãƒ³ã‚¯"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "é€ä¿¡"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã‚’è¨å®š"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "æœ‰åŠ¹æœŸé™"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "ãƒ¡ãƒ¼ãƒ«çµŒç”±ã§å…±æœ‰:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "å†å…±æœ‰ã¯è¨±å¯ã•ã‚Œã¦ã„ã¾ã›ã‚“"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "{item} å†…ã§ {user} ã¨å…±æœ‰ä¸"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "å…±æœ‰è§£é™¤"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "ç·¨é›†å¯èƒ½"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ã‚¢ã‚¯ã‚»ã‚¹æ¨©é™"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "ä½œæˆ"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "å‰Šé™¤"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "å…±æœ‰"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ä¿è·"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã®æœªè¨å®šã‚¨ãƒ©ãƒ¼"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "æœ‰åŠ¹æœŸé™ã®è¨å®šã§ã‚¨ãƒ©ãƒ¼ç™ºç”Ÿ"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "é€ä¿¡ä¸..."
 
-#: js/share.js:592
+#: js/share.js:609
 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 "æ›´æ–°ã«æˆåŠŸã—ã¾ã—ãŸã€‚ã“ã®å•é¡Œã‚’ <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 "æ›´æ–°ã«æˆåŠŸã—ã¾ã—ãŸã€‚ä»Šã™ãownCloudã«ãƒªãƒ€ã‚¤ãƒ¬ã‚¯ãƒˆã—ã¾ã™ã€‚"
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloudã®ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒªã‚»ãƒƒãƒˆã—ã¾ã™"
@@ -445,87 +539,11 @@ msgstr "ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ãƒ›ã‚¹ãƒˆå"
 msgid "Finish setup"
 msgstr "ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’å®Œäº†ã—ã¾ã™"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "æ—¥"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "æœˆ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "ç«"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "æ°´"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "æœ¨"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "é‡‘"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "åœŸ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "1æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "2æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "3æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "4æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "5æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "6æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "7æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "8æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "9æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "10æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "11æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "12æœˆ"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "ç®¡ç†ä¸‹ã«ã‚ã‚‹ã‚¦ã‚§ãƒ–ã‚µãƒ¼ãƒ“ã‚¹"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "ãƒã‚°ã‚¢ã‚¦ãƒˆ"
 
@@ -567,17 +585,3 @@ msgstr "æ¬¡"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "ownCloud ã‚’ãƒãƒ¼ã‚¸ãƒ§ãƒ³ %s ã«æ›´æ–°ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ä¸‹ã•ã„ã€‚"
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£è¦å‘Šï¼"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã®ç¢ºèª<br/>ã‚»ã‚ãƒ¥ãƒªãƒ†ã‚£ä¸Šã®ç†ç”±ã«ã‚ˆã‚Šãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã®å†å…¥åŠ›ã‚’ãŠé¡˜ã„ã—ã¾ã™ã€‚"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ç¢ºèª"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 74cabcaca6b923104fe0a0a5a40dcd675acc386b..5a4b882085bff7be6591e807a1f7bb74e479b71b 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/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-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 04:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 01: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"
@@ -35,46 +35,46 @@ msgstr "%s ã‚’ç§»å‹•ã§ãã¾ã›ã‚“ã§ã—ãŸ"
 msgid "Unable to rename file"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«åã®å¤‰æ›´ãŒã§ãã¾ã›ã‚“"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã¯ä½•ã‚‚ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚ä¸æ˜Žãªã‚¨ãƒ©ãƒ¼"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "ã‚¨ãƒ©ãƒ¼ã¯ã‚ã‚Šã¾ã›ã‚“ã€‚ãƒ•ã‚¡ã‚¤ãƒ«ã®ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã¯æˆåŠŸã—ã¾ã—ãŸ"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯php.ini ã® upload_max_filesize ã«è¨å®šã•ã‚ŒãŸã‚µã‚¤ã‚ºã‚’è¶…ãˆã¦ã„ã¾ã™:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚ŒãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯HTMLã®ãƒ•ã‚©ãƒ¼ãƒ ã«è¨å®šã•ã‚ŒãŸMAX_FILE_SIZEã«è¨å®šã•ã‚ŒãŸã‚µã‚¤ã‚ºã‚’è¶…ãˆã¦ã„ã¾ã™"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã¯ä¸€éƒ¨åˆ†ã—ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ãƒ†ãƒ³ãƒãƒ©ãƒªãƒ•ã‚©ãƒ«ãƒ€ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ãƒ‡ã‚£ã‚¹ã‚¯ã¸ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "åˆ©ç”¨å¯èƒ½ãªã‚¹ãƒšãƒ¼ã‚¹ãŒååˆ†ã«ã‚ã‚Šã¾ã›ã‚“"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã«ååˆ†ãªç©ºãå®¹é‡ãŒã‚ã‚Šã¾ã›ã‚“"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "ç„¡åŠ¹ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚"
 
@@ -82,11 +82,11 @@ msgstr "ç„¡åŠ¹ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã™ã€‚"
 msgid "Files"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "å…±æœ‰ã—ãªã„"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "å‰Šé™¤"
 
@@ -94,137 +94,151 @@ msgstr "å‰Šé™¤"
 msgid "Rename"
 msgstr "åå‰ã®å¤‰æ›´"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} ã¯ã™ã§ã«å˜åœ¨ã—ã¦ã„ã¾ã™"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "ç½®ãæ›ãˆ"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "æŽ¨å¥¨åç§°"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name} ã‚’ç½®æ›"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "å…ƒã«æˆ»ã™"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ã‚’ {new_name} ã«ç½®æ›"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "æœªå…±æœ‰ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "å‰Šé™¤ {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' ã¯ç„¡åŠ¹ãªãƒ•ã‚¡ã‚¤ãƒ«åã§ã™ã€‚"
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«åã‚’ç©ºã«ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“ã€‚"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ç„¡åŠ¹ãªåå‰ã€'\\', '/', '<', '>', ':', '\"', '|', '?', '*' ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“ã€‚"
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIPãƒ•ã‚¡ã‚¤ãƒ«ã‚’ç”Ÿæˆä¸ã§ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€‚"
+#: 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 "ã‚ãªãŸã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã¯ã»ã¼ä¸€æ¯ã§ã™ï¼ˆ{usedSpacePercent}%ï¼‰"
 
-#: js/files.js:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã®æº–å‚™ä¸ã§ã™ã€‚ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒå¤§ãã„å ´åˆã¯å°‘ã—æ™‚é–“ãŒã‹ã‹ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã€‚"
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã‚‚ã—ãã¯0ãƒã‚¤ãƒˆã®ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã§ãã¾ã›ã‚“"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚¨ãƒ©ãƒ¼"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "é–‰ã˜ã‚‹"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ä¿ç•™"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’1ã¤ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ä¸"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã¯ã‚ãƒ£ãƒ³ã‚»ãƒ«ã•ã‚Œã¾ã—ãŸã€‚"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«è»¢é€ã‚’å®Ÿè¡Œä¸ã§ã™ã€‚ä»Šã“ã®ãƒšãƒ¼ã‚¸ã‹ã‚‰ç§»å‹•ã™ã‚‹ã¨ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ãŒä¸æ¢ã•ã‚Œã¾ã™ã€‚"
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URLã¯ç©ºã«ã§ãã¾ã›ã‚“ã€‚"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ç„¡åŠ¹ãªãƒ•ã‚©ãƒ«ãƒ€åã§ã™ã€‚'Shared' ã®åˆ©ç”¨ã¯ ownCloud ãŒäºˆç´„æ¸ˆã¿ã§ã™ã€‚"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¹ã‚ãƒ£ãƒ³"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "ã‚¹ã‚ãƒ£ãƒ³ä¸ã®ã‚¨ãƒ©ãƒ¼"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "åå‰"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "ã‚µã‚¤ã‚º"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "æ›´æ–°æ—¥æ™‚"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 ãƒ•ã‚©ãƒ«ãƒ€"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} ãƒ•ã‚©ãƒ«ãƒ€"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 ãƒ•ã‚¡ã‚¤ãƒ«"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} ãƒ•ã‚¡ã‚¤ãƒ«"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«æ“ä½œ"
@@ -273,36 +287,32 @@ msgstr "ãƒ•ã‚©ãƒ«ãƒ€"
 msgid "From link"
 msgstr "ãƒªãƒ³ã‚¯"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã‚’ã‚ãƒ£ãƒ³ã‚»ãƒ«"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "ã“ã“ã«ã¯ä½•ã‚‚ã‚ã‚Šã¾ã›ã‚“ã€‚ä½•ã‹ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã¦ãã ã•ã„ã€‚"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚µã‚¤ã‚ºãŒå¤§ãã™ãŽã¾ã™"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ã‚¢ãƒƒãƒ—ãƒãƒ¼ãƒ‰ã—ã‚ˆã†ã¨ã—ã¦ã„ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã¯ã€ã‚µãƒ¼ãƒã§è¦å®šã•ã‚ŒãŸæœ€å¤§ã‚µã‚¤ã‚ºã‚’è¶…ãˆã¦ã„ã¾ã™ã€‚"
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã‚’ã‚¹ã‚ãƒ£ãƒ³ã—ã¦ã„ã¾ã™ã€ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„ã€‚"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "ã‚¹ã‚ãƒ£ãƒ³ä¸"
diff --git a/l10n/ja_JP/files_encryption.po b/l10n/ja_JP/files_encryption.po
index c9941a81c9cc4518154ab257e2a5fa247c6b476e..2c42c902059cea1df5b8c79861643db1f7681cdf 100644
--- a/l10n/ja_JP/files_encryption.po
+++ b/l10n/ja_JP/files_encryption.po
@@ -4,32 +4,81 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 02:43+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2013-01-24 00:06+0100\n"
+"PO-Revision-Date: 2013-01-23 03:07+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "å¤‰æ›ã‚’å®Œäº†ã™ã‚‹ãŸã‚ã«ã€ownCloud ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã«åˆ‡ã‚Šæ›¿ãˆã¦ã€æš—å·åŒ–ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’å¤‰æ›´ã—ã¦ãã ã•ã„ã€‚"
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚µã‚¤ãƒ‰ã®æš—å·åŒ–ã«åˆ‡ã‚Šæ›¿ãˆã¾ã—ãŸ"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "æš—å·åŒ–ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒã‚°ã‚¤ãƒ³ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã«å¤‰æ›´"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ç¢ºèªã—ã¦ã‚‚ã†ä¸€åº¦è¡Œãªã£ã¦ãã ã•ã„ã€‚"
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "ãƒ•ã‚¡ã‚¤ãƒ«æš—å·åŒ–ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã‚’ãƒã‚°ã‚¤ãƒ³ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰ã«å¤‰æ›´ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "æš—å·åŒ–ãƒ¢ãƒ¼ãƒ‰ã‚’é¸æŠž:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚µã‚¤ãƒ‰ã®æš—å·åŒ–ï¼ˆæœ€ã‚‚ã‚»ã‚ãƒ¥ã‚¢ã§ã™ãŒã€WEBã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ã‹ã‚‰ãƒ‡ãƒ¼ã‚¿ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªããªã‚Šã¾ã™ï¼‰"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "ã‚µãƒ¼ãƒã‚µã‚¤ãƒ‰æš—å·åŒ–ï¼ˆWEBã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ãƒ¼ã‚¹ãŠã‚ˆã³ãƒ‡ã‚¹ã‚¯ãƒˆãƒƒãƒ—ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ï¼‰"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "æš—å·åŒ–ç„¡ã—ï¼ˆä½•ã‚‚æš—å·åŒ–ã—ã¾ã›ã‚“ï¼‰"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "é‡è¦: ä¸€åº¦æš—å·åŒ–ã‚’é¸æŠžã—ã¦ã—ã¾ã†ã¨ã€ã‚‚ã¨ã«æˆ»ã™æ–¹æ³•ã¯ã‚ã‚Šã¾ã›ã‚“"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "ãƒ¦ãƒ¼ã‚¶æŒ‡å®šï¼ˆãƒ¦ãƒ¼ã‚¶ãŒé¸ã¹ã‚‹ã‚ˆã†ã«ã™ã‚‹ï¼‰"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "æš—å·åŒ–"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "æš—å·åŒ–ã‹ã‚‰é™¤å¤–ã™ã‚‹ãƒ•ã‚¡ã‚¤ãƒ«ã‚¿ã‚¤ãƒ—"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "ãªã—"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "æš—å·åŒ–ã‚’æœ‰åŠ¹ã«ã™ã‚‹"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 9c717bd2fa404b9753aa0ba51812dd3099b1be2a..5ebe43b4854401f04d91122300c15795b56058bd 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.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-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 00:30+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\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"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "ã™ã¹ã¦ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å‰Šé™¤ã™ã‚‹"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "å±¥æ´"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "ãƒãƒ¼ã‚¸ãƒ§ãƒ³"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "ã“ã‚Œã¯ã€ã‚ãªãŸã®ãƒ•ã‚¡ã‚¤ãƒ«ã®ã™ã¹ã¦ã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã‚’å‰Šé™¤ã—ã¾ã™"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ç®¡ç†"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 2f16f6575407be20ac8e5086499e8f06c0a3a6a9..8dca4957997a6845ae1d4f3894757844f255e5ab 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 00:37+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2013-01-19 00:04+0100\n"
+"PO-Revision-Date: 2013-01-18 08:12+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +19,55 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "ãƒ˜ãƒ«ãƒ—"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "å€‹äººè¨å®š"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "ãƒ¦ãƒ¼ã‚¶"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "ã‚¢ãƒ—ãƒª"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "ç®¡ç†è€…"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIPãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã¯ç„¡åŠ¹ã§ã™ã€‚"
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚"
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ãƒ•ã‚¡ã‚¤ãƒ«ã«æˆ»ã‚‹"
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "èªè¨¼ã‚¨ãƒ©ãƒ¼"
 
@@ -82,55 +87,55 @@ msgstr "TTY TDD"
 msgid "Images"
 msgstr "ç”»åƒ"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1åˆ†å‰"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d åˆ†å‰"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 æ™‚é–“å‰"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d æ™‚é–“å‰"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ä»Šæ—¥"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "æ˜¨æ—¥"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d æ—¥å‰"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "å…ˆæœˆ"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d åˆ†å‰"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "æ˜¨å¹´"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "å¹´å‰"
 
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 69bbdf54d2d85a5eaa90c94a7e41793ad716c5c3..4871013dbf6b02257d76b546eb355b3f256fb765 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "æœ‰åŠ¹"
 msgid "Saving..."
 msgstr "ä¿å˜ä¸..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Japanese (æ—¥æœ¬èªž)"
 
@@ -103,15 +103,15 @@ msgstr "ã‚¢ãƒ—ãƒªã‚’è¿½åŠ "
 msgid "More Apps"
 msgstr "ã•ã‚‰ã«ã‚¢ãƒ—ãƒªã‚’è¡¨ç¤º"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "ã‚¢ãƒ—ãƒªã‚’é¸æŠžã—ã¦ãã ã•ã„"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com ã§ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã®ãƒšãƒ¼ã‚¸ã‚’è¦‹ã¦ãã ã•ã„"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ãƒ©ã‚¤ã‚»ãƒ³ã‚¹: <span class=\"author\"></span>"
 
@@ -160,7 +160,7 @@ msgstr "Androidã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚’ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰"
 msgid "Download iOS Client"
 msgstr "iOSã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚’ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ãƒ‘ã‚¹ãƒ¯ãƒ¼ãƒ‰"
 
@@ -230,11 +230,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "åå‰"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "ã‚°ãƒ«ãƒ¼ãƒ—"
 
@@ -246,26 +246,30 @@ msgstr "ä½œæˆ"
 msgid "Default Storage"
 msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "ç„¡åˆ¶é™"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "ãã®ä»–"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ã‚°ãƒ«ãƒ¼ãƒ—ç®¡ç†è€…"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆ"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "å‰Šé™¤"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 39aa1002f7efbddcc11bba57f9839d44a8330138..16a20c7207b27bee51f8ffe989b8798633583633 100644
--- a/l10n/ja_JP/user_ldap.po
+++ b/l10n/ja_JP/user_ldap.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
 #   <tetuyano+transi@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 06:21+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 05:47+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"
@@ -29,9 +29,9 @@ msgstr "<b>è¦å‘Š:</b> user_ldap ã¨ user_webdavauth ã®ã‚¢ãƒ—ãƒªã«ã¯äº’æ›æ€§
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>è¦å‘Š:</b> PHP LDAP ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒæ£ã—ãã©ã†ã•ã—ã¾ã›ã‚“ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚"
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>è¦å‘Š:</b> PHP LDAP ãƒ¢ã‚¸ãƒ¥ãƒ¼ãƒ«ãŒã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã•ã‚Œã¦ã„ã¾ã›ã‚“ã€‚ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰ãŒæ£ã—ãå‹•ä½œã—ã¾ã›ã‚“ã€‚ã‚·ã‚¹ãƒ†ãƒ ç®¡ç†è€…ã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã™ã‚‹ã‚ˆã†å•ã„åˆã‚ã›ã¦ãã ã•ã„ã€‚"
 
 #: templates/settings.php:15
 msgid "Host"
@@ -46,6 +46,10 @@ msgstr "SSLé€šä¿¡ã—ãªã„å ´åˆã«ã¯ã€ãƒ—ãƒãƒˆã‚³ãƒ«åã‚’çœç•¥ã™ã‚‹ã“ã¨
 msgid "Base DN"
 msgstr "ãƒ™ãƒ¼ã‚¹DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "1è¡Œã«1ã¤ã®ãƒ™ãƒ¼ã‚¹DN"
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "æ‹¡å¼µã‚¿ãƒ–ã§ãƒ¦ãƒ¼ã‚¶ã¨ã‚°ãƒ«ãƒ¼ãƒ—ã®ãƒ™ãƒ¼ã‚¹DNã‚’æŒ‡å®šã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
@@ -117,10 +121,18 @@ msgstr "ãƒãƒ¼ãƒˆ"
 msgid "Base User Tree"
 msgstr "ãƒ™ãƒ¼ã‚¹ãƒ¦ãƒ¼ã‚¶ãƒ„ãƒªãƒ¼"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "1è¡Œã«1ã¤ã®ãƒ¦ãƒ¼ã‚¶ãƒ™ãƒ¼ã‚¹DN"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "ãƒ™ãƒ¼ã‚¹ã‚°ãƒ«ãƒ¼ãƒ—ãƒ„ãƒªãƒ¼"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "1è¡Œã«1ã¤ã®ã‚°ãƒ«ãƒ¼ãƒ—ãƒ™ãƒ¼ã‚¹DN"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "ã‚°ãƒ«ãƒ¼ãƒ—ã¨ãƒ¡ãƒ³ãƒãƒ¼ã®é–¢é€£ä»˜ã‘"
diff --git a/l10n/ja_JP/user_webdavauth.po b/l10n/ja_JP/user_webdavauth.po
index b6499e4ce5fc0503ce58d8a5fc0c5957da596dbc..966cae84162c4404c705c34266fc7cd3a0a305a2 100644
--- a/l10n/ja_JP/user_webdavauth.po
+++ b/l10n/ja_JP/user_webdavauth.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
-# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 03:51+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 05:50+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV èªè¨¼"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloudã®ã“ã®URLã¸ã®ãƒ¦ãƒ¼ã‚¶è³‡æ ¼æƒ…å ±ã®é€ä¿¡ã¯ã€è³‡æ ¼æƒ…å ±ãŒé–“é•ã£ã¦ã„ã‚‹å ´åˆã¯HTTP401ã‚‚ã—ãã¯403ã‚’è¿”ã—ã€æ£ã—ã„å ´åˆã¯å…¨ã¦ã®ã‚³ãƒ¼ãƒ‰ã‚’è¿”ã—ã¾ã™ã€‚"
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloudã¯ã“ã®URLã«ãƒ¦ãƒ¼ã‚¶è³‡æ ¼æƒ…å ±ã‚’é€ä¿¡ã—ã¾ã™ã€‚ã“ã®ãƒ—ãƒ©ã‚°ã‚¤ãƒ³ã¯å¿œç”ã‚’ãƒã‚§ãƒƒã‚¯ã—ã€HTTPçŠ¶æ…‹ã‚³ãƒ¼ãƒ‰ãŒ 401 ã¨ 403 ã®å ´åˆã¯ç„¡åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã€ä»–ã®å¿œç”ã¯ã™ã¹ã¦æœ‰åŠ¹ãªè³‡æ ¼æƒ…å ±ã¨ã—ã¦å‡¦ç†ã—ã¾ã™ã€‚"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index d1a73ee13665ee4b83be5f71eb023334c2b0ff49..87ed1f83cd4144dbb77411969d0ef7b0ea7690fa 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr "áƒ¡áƒáƒ áƒ”áƒ“áƒáƒ¥áƒ¢áƒ˜áƒ áƒ”áƒ‘áƒ”áƒšáƒ˜ áƒ™áƒáƒ¢áƒ”áƒ’áƒáƒ áƒ˜
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "áƒ™áƒ•áƒ˜áƒ áƒ"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "áƒáƒ áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "áƒ¡áƒáƒ›áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "áƒáƒ—áƒ®áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "áƒ®áƒ£áƒ—áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "áƒžáƒáƒ áƒáƒ¡áƒ™áƒ”áƒ•áƒ˜"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
+
+#: js/config.php:33
+msgid "January"
+msgstr "áƒ˜áƒáƒœáƒ•áƒáƒ áƒ˜"
+
+#: js/config.php:33
+msgid "February"
+msgstr "áƒ—áƒ”áƒ‘áƒ”áƒ áƒ•áƒáƒšáƒ˜"
+
+#: js/config.php:33
+msgid "March"
+msgstr "áƒ›áƒáƒ áƒ¢áƒ˜"
+
+#: js/config.php:33
+msgid "April"
+msgstr "áƒáƒžáƒ áƒ˜áƒšáƒ˜"
+
+#: js/config.php:33
+msgid "May"
+msgstr "áƒ›áƒáƒ˜áƒ¡áƒ˜"
+
+#: js/config.php:33
+msgid "June"
+msgstr "áƒ˜áƒ•áƒœáƒ˜áƒ¡áƒ˜"
+
+#: js/config.php:33
+msgid "July"
+msgstr "áƒ˜áƒ•áƒšáƒ˜áƒ¡áƒ˜"
+
+#: js/config.php:33
+msgid "August"
+msgstr "áƒáƒ’áƒ•áƒ˜áƒ¡áƒ¢áƒ"
+
+#: js/config.php:33
+msgid "September"
+msgstr "áƒ¡áƒ”áƒ¥áƒ¢áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
+
+#: js/config.php:33
+msgid "October"
+msgstr "áƒáƒ¥áƒ¢áƒáƒ›áƒ‘áƒ”áƒ áƒ˜"
+
+#: js/config.php:33
+msgid "November"
+msgstr "áƒœáƒáƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
+
+#: js/config.php:33
+msgid "December"
+msgstr "áƒ“áƒ”áƒ™áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "áƒ“áƒ¦áƒ”áƒ¡"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} áƒ“áƒ¦áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "áƒ—áƒ•áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "áƒ‘áƒáƒšáƒ áƒ¬áƒ”áƒšáƒ¡"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ"
 
@@ -175,123 +251,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒªáƒ•áƒšáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ”"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "áƒ’áƒáƒ£áƒ–áƒ˜áƒáƒ áƒ” áƒšáƒ˜áƒœáƒ™áƒ˜áƒ—"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ— áƒ“áƒáƒªáƒ•áƒ"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "áƒ›áƒ˜áƒ£áƒ—áƒ˜áƒ—áƒ” áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ“áƒ áƒ"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "áƒ’áƒáƒáƒ–áƒ˜áƒáƒ áƒ” áƒ›áƒ”áƒ˜áƒšáƒ–áƒ”"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒœáƒáƒžáƒáƒ•áƒœáƒ˜"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "áƒ›áƒ”áƒáƒ áƒ”áƒ¯áƒ”áƒ  áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ áƒáƒ  áƒáƒ áƒ˜áƒ¡ áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ£áƒšáƒ˜"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "áƒ¨áƒ”áƒ’áƒ˜áƒ«áƒšáƒ˜áƒ áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ˜áƒ¡ áƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ˜"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "áƒ’áƒáƒœáƒáƒ®áƒšáƒ”áƒ‘áƒ"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜áƒ— áƒ“áƒáƒªáƒ£áƒšáƒ˜"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ•áƒáƒ“áƒ˜áƒ¡ áƒ’áƒáƒ¡áƒ•áƒšáƒ˜áƒ¡ áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ˜áƒ¡ áƒ“áƒ áƒáƒ¡"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
@@ -443,87 +537,11 @@ msgstr "áƒ‘áƒáƒ–áƒ˜áƒ¡ áƒ°áƒáƒ¡áƒ¢áƒ˜"
 msgid "Finish setup"
 msgstr "áƒ™áƒáƒœáƒ¤áƒ˜áƒ’áƒ£áƒ áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ“áƒáƒ¡áƒ áƒ£áƒšáƒ”áƒ‘áƒ"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "áƒ™áƒ•áƒ˜áƒ áƒ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "áƒáƒ áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "áƒ¡áƒáƒ›áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "áƒáƒ—áƒ®áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "áƒ®áƒ£áƒ—áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "áƒžáƒáƒ áƒáƒ¡áƒ™áƒ”áƒ•áƒ˜"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "áƒ¨áƒáƒ‘áƒáƒ—áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "áƒ˜áƒáƒœáƒ•áƒáƒ áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "áƒ—áƒ”áƒ‘áƒ”áƒ áƒ•áƒáƒšáƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "áƒ›áƒáƒ áƒ¢áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "áƒáƒžáƒ áƒ˜áƒšáƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "áƒ›áƒáƒ˜áƒ¡áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "áƒ˜áƒ•áƒœáƒ˜áƒ¡áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "áƒ˜áƒ•áƒšáƒ˜áƒ¡áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "áƒáƒ’áƒ•áƒ˜áƒ¡áƒ¢áƒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "áƒ¡áƒ”áƒ¥áƒ¢áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "áƒáƒ¥áƒ¢áƒáƒ›áƒ‘áƒ”áƒ áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "áƒœáƒáƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "áƒ“áƒ”áƒ™áƒ”áƒ›áƒ‘áƒ”áƒ áƒ˜"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ™áƒáƒœáƒ¢áƒ áƒáƒšáƒ˜áƒ¡ áƒ¥áƒ•áƒ”áƒ¨ áƒ›áƒ§áƒáƒ¤áƒ˜ áƒ•áƒ”áƒ‘ áƒ¡áƒ”áƒ áƒ•áƒ˜áƒ¡áƒ”áƒ‘áƒ˜"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "áƒ’áƒáƒ›áƒáƒ¡áƒ•áƒšáƒ"
 
@@ -565,17 +583,3 @@ msgstr "áƒ¨áƒ”áƒ›áƒ“áƒ”áƒ’áƒ˜"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "áƒ£áƒ¡áƒáƒ¤áƒ áƒ—áƒ®áƒáƒ”áƒ‘áƒ˜áƒ¡ áƒ’áƒáƒ¤áƒ áƒ—áƒ®áƒ˜áƒšáƒ”áƒ‘áƒ!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "áƒ¨áƒ”áƒ›áƒáƒ¬áƒ›áƒ”áƒ‘áƒ"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 27c92e92ba55f2655da07e07d8b126d6d7831a7f..55891c6815d205b5cc1c2d6efe1de6a377e6f88e 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:05+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -32,46 +32,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "áƒáƒáƒªáƒ“áƒáƒ›áƒ áƒáƒ  áƒ“áƒáƒ¤áƒ˜áƒ¥áƒ¡áƒ˜áƒ áƒ“áƒ, áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ¬áƒáƒ áƒ›áƒáƒ¢áƒ”áƒ‘áƒ˜áƒ— áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜ áƒáƒáƒáƒ áƒ‘áƒ”áƒ‘áƒ¡  MAX_FILE_SIZE áƒ“áƒ˜áƒ áƒ”áƒ¥áƒ¢áƒ˜áƒ•áƒáƒ¡, áƒ áƒáƒ›áƒ”áƒšáƒ˜áƒª áƒ›áƒ˜áƒ—áƒ˜áƒ—áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ HTML áƒ¤áƒáƒ áƒ›áƒáƒ¨áƒ˜"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ£áƒšáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ›áƒ®áƒáƒšáƒáƒ“ áƒœáƒáƒ¬áƒ˜áƒšáƒáƒ‘áƒ áƒ˜áƒ• áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜ áƒáƒ  áƒáƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "áƒ“áƒ áƒáƒ”áƒ‘áƒ˜áƒ—áƒ˜ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ” áƒáƒ  áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ“áƒ˜áƒ¡áƒ™áƒ–áƒ” áƒ©áƒáƒ¬áƒ”áƒ áƒ˜áƒ¡áƒáƒ¡"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -79,11 +79,11 @@ msgstr ""
 msgid "Files"
 msgstr "áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ˜áƒ¡ áƒ›áƒáƒ®áƒ¡áƒœáƒ"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 
@@ -91,137 +91,151 @@ msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
 msgid "Rename"
 msgstr "áƒ’áƒáƒ“áƒáƒ áƒ¥áƒ›áƒ”áƒ•áƒ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} áƒ£áƒ™áƒ•áƒ” áƒáƒ áƒ¡áƒ”áƒ‘áƒáƒ‘áƒ¡"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "áƒ¨áƒ”áƒªáƒ•áƒšáƒ"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜áƒ¡ áƒ¨áƒ”áƒ›áƒáƒ—áƒáƒ•áƒáƒ–áƒ”áƒ‘áƒ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "áƒ£áƒáƒ áƒ§áƒáƒ¤áƒ"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name} áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "áƒ“áƒáƒ‘áƒ áƒ£áƒœáƒ”áƒ‘áƒ"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ {old_name}â€“áƒ˜áƒ—"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "áƒ’áƒáƒ–áƒ˜áƒáƒ áƒ”áƒ‘áƒ áƒ›áƒáƒ®áƒ¡áƒœáƒ˜áƒšáƒ˜ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ˜áƒšáƒ˜ {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP-áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ’áƒ”áƒœáƒ”áƒ áƒ˜áƒ áƒ”áƒ‘áƒ, áƒáƒ›áƒáƒ¡ áƒáƒ˜áƒ áƒ“áƒ”áƒ‘áƒ áƒ’áƒáƒ áƒ™áƒ•áƒ”áƒ£áƒšáƒ˜ áƒ“áƒ áƒ."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "áƒ—áƒ¥áƒ•áƒ”áƒœáƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ áƒ•áƒ”áƒ  áƒ›áƒáƒ®áƒ”áƒ áƒ®áƒ“áƒ. áƒ˜áƒ¡ áƒáƒ áƒ˜áƒ¡ áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ” áƒ“áƒ áƒ¨áƒ”áƒ˜áƒªáƒáƒ•áƒ¡ 0 áƒ‘áƒáƒ˜áƒ¢áƒ¡"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡áƒáƒ¡"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "áƒ“áƒáƒ®áƒ£áƒ áƒ•áƒ"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "áƒ›áƒáƒªáƒ“áƒ˜áƒ¡ áƒ áƒ”áƒŸáƒ˜áƒ›áƒ¨áƒ˜"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ˜áƒ¢áƒ•áƒ˜áƒ áƒ—áƒ”áƒ‘áƒ"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒ£áƒš áƒ˜áƒ¥áƒœáƒ."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ. áƒ¡áƒ®áƒ•áƒ áƒ’áƒ•áƒ”áƒ áƒ“áƒ–áƒ” áƒ’áƒáƒ“áƒáƒ¡áƒ•áƒšáƒ áƒ’áƒáƒ›áƒáƒ˜áƒ¬áƒ•áƒ”áƒ•áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ¨áƒ”áƒ©áƒ”áƒ áƒ”áƒ‘áƒáƒ¡"
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ˜áƒ¡áƒáƒ¡"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "áƒ–áƒáƒ›áƒ"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "áƒ¨áƒ”áƒªáƒ•áƒšáƒ˜áƒšáƒ˜áƒ"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 áƒ¤áƒáƒ˜áƒšáƒ˜"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} áƒ¤áƒáƒ˜áƒšáƒ˜"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ“áƒáƒ›áƒ£áƒ¨áƒáƒ•áƒ”áƒ‘áƒ"
@@ -270,36 +284,32 @@ msgstr "áƒ¡áƒáƒ¥áƒáƒ¦áƒáƒšáƒ“áƒ”"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ˜áƒ¡ áƒ’áƒáƒ£áƒ¥áƒ›áƒ”áƒ‘áƒ"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "áƒáƒ¥ áƒáƒ áƒáƒ¤áƒ”áƒ áƒ˜ áƒáƒ  áƒáƒ áƒ˜áƒ¡. áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ” áƒ áƒáƒ›áƒ”!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "áƒ©áƒáƒ›áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒ"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "áƒáƒ¡áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ˜ áƒ¤áƒáƒ˜áƒšáƒ˜ áƒ«áƒáƒšáƒ˜áƒáƒœ áƒ“áƒ˜áƒ“áƒ˜áƒ"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "áƒ¤áƒáƒ˜áƒšáƒ˜áƒ¡ áƒ–áƒáƒ›áƒ áƒ áƒáƒ›áƒšáƒ˜áƒ¡ áƒáƒ¢áƒ•áƒ˜áƒ áƒ—áƒ•áƒáƒ¡áƒáƒª áƒ—áƒ¥áƒ•áƒ”áƒœ áƒáƒžáƒ˜áƒ áƒ”áƒ‘áƒ—, áƒáƒáƒáƒ áƒ‘áƒ”áƒ‘áƒ¡ áƒ¡áƒ”áƒ áƒ•áƒ”áƒ áƒ–áƒ” áƒ“áƒáƒ¨áƒ•áƒ”áƒ‘áƒ£áƒš áƒ›áƒáƒ¥áƒ¡áƒ˜áƒ›áƒ£áƒ›áƒ¡."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ”áƒáƒ‘áƒ¡ áƒ¤áƒáƒ˜áƒšáƒ”áƒ‘áƒ˜áƒ¡ áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ, áƒ’áƒ—áƒ®áƒáƒ•áƒ— áƒ“áƒáƒ”áƒšáƒáƒ“áƒáƒ—."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "áƒ›áƒ˜áƒ›áƒ“áƒ˜áƒœáƒáƒ áƒ” áƒ¡áƒ™áƒáƒœáƒ˜áƒ áƒ”áƒ‘áƒ"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
index 3cdf3ae4e91573ddbe67e013787cfff11399b095..f0cc786850b50a4410fab1e3846c58f0468625af 100644
--- a/l10n/ka_GE/files_encryption.po
+++ b/l10n/ka_GE/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,18 +17,66 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
index 8d38b072b0fa7fe7bb40269aa03adfd3c60429ad..aafddd05a3cf1aef375f984e522f53ef5de35d28 100644
--- a/l10n/ka_GE/files_versions.po
+++ b/l10n/ka_GE/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
index 3011c8854f700d77dc4ad88d655f026f975cf421..f43fa26c139991902a1771e67bfeba7870064645 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "áƒžáƒ˜áƒ áƒáƒ“áƒ˜"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "áƒžáƒáƒ áƒáƒ›áƒ”áƒ¢áƒ áƒ”áƒ‘áƒ˜"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "áƒ›áƒáƒ›áƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ”áƒšáƒ˜"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "áƒáƒ•áƒ—áƒ”áƒœáƒ¢áƒ˜áƒ¤áƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ¨áƒ”áƒªáƒ“áƒáƒ›áƒ"
 
@@ -82,55 +86,55 @@ msgstr "áƒ¢áƒ”áƒ¥áƒ¡áƒ¢áƒ˜"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "áƒ¬áƒáƒ›áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 áƒ¬áƒ£áƒ—áƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "áƒ“áƒ¦áƒ”áƒ¡"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "áƒ’áƒ£áƒ¨áƒ˜áƒœ"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "áƒ’áƒáƒ¡áƒ£áƒš áƒ—áƒ•áƒ”áƒ¨áƒ˜"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "áƒ‘áƒáƒšáƒ áƒ¬áƒ”áƒšáƒ¡"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "áƒ¬áƒšáƒ˜áƒ¡ áƒ¬áƒ˜áƒœ"
 
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 4fe1200ec3c387a0b4c0f2cd5f30e212cce2cfd9..3f35403cfabdcc21c0bbffee90699bae9a3de5c2 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "áƒ©áƒáƒ áƒ—áƒ•áƒ"
 msgid "Saving..."
 msgstr "áƒ¨áƒ”áƒœáƒáƒ®áƒ•áƒ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -100,15 +100,15 @@ msgstr "áƒ“áƒáƒáƒ›áƒáƒ¢áƒ” áƒ¨áƒ”áƒœáƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ"
 msgid "More Apps"
 msgstr "áƒ£áƒ¤áƒ áƒ áƒ›áƒ”áƒ¢áƒ˜ áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”áƒ‘áƒ˜"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "áƒáƒ˜áƒ áƒ©áƒ˜áƒ”áƒ— áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "áƒœáƒáƒ®áƒ”áƒ— áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ˜áƒ¡ áƒ’áƒ•áƒ”áƒ áƒ“áƒ˜ apps.owncloud.com â€“áƒ–áƒ”"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-áƒšáƒ˜áƒªáƒ”áƒœáƒ¡áƒ˜áƒ áƒ”áƒ‘áƒ£áƒšáƒ˜áƒ <span class=\"author\"></span>"
 
@@ -157,7 +157,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "áƒžáƒáƒ áƒáƒšáƒ˜"
 
@@ -227,11 +227,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜"
 
@@ -243,26 +243,30 @@ msgstr "áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "áƒ¡áƒ®áƒ•áƒ"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "áƒ¯áƒ’áƒ£áƒ¤áƒ˜áƒ¡ áƒáƒ“áƒ›áƒ˜áƒœáƒ˜áƒ¡áƒ¢áƒ áƒáƒ¢áƒáƒ áƒ˜"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "áƒ¬áƒáƒ¨áƒšáƒ"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index 0df8aa5b1a46a23e05ebbe137024dd132c156a0e..14dbca3fc68800eb5312a82214e6ff03caa5effe 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ"
diff --git a/l10n/ka_GE/user_webdavauth.po b/l10n/ka_GE/user_webdavauth.po
index 4582092b83e75977160591fac5cb78854de3cb94..b7a0b5576301a2e68b6d6a48cc03d82ce581e1bb 100644
--- a/l10n/ka_GE/user_webdavauth.po
+++ b/l10n/ka_GE/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: ka_GE\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index b64937e17c9dfac31d7ea6c3455213614a8b65fb..8ba96b125ba53d11cdd7123efac2d5793711215e 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "User %s ê°€ ë‹¹ì‹ ê³¼ íŒŒì¼ì„ ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤."
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "User %s ê°€ ë‹¹ì‹ ê³¼ í´ë”ë¥¼ ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤."
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "User %s ê°€ íŒŒì¼ \"%s\"ë¥¼ ë‹¹ì‹ ê³¼ ê³µìœ í•˜ì˜€ìŠµë‹ˆë‹¤. ë‹¤ìš´ë¡œë“œëŠ” ì—¬ê¸°ì„œ %s í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤."
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,59 +83,135 @@ msgstr "ì‚ì œí•  ë¶„ë¥˜ë¥¼ ì„ íƒí•˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤."
 msgid "Error removing %s from favorites."
 msgstr "ì±…ê°ˆí”¼ì—ì„œ %sì„(ë¥¼) ì‚ì œí•  ìˆ˜ ì—†ì—ˆìŠµë‹ˆë‹¤."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "ì¼ìš”ì¼"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "ì›”ìš”ì¼"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "í™”ìš”ì¼"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "ìˆ˜ìš”ì¼"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "ëª©ìš”ì¼"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "ê¸ˆìš”ì¼"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "í† ìš”ì¼"
+
+#: js/config.php:33
+msgid "January"
+msgstr "1ì›”"
+
+#: js/config.php:33
+msgid "February"
+msgstr "2ì›”"
+
+#: js/config.php:33
+msgid "March"
+msgstr "3ì›”"
+
+#: js/config.php:33
+msgid "April"
+msgstr "4ì›”"
+
+#: js/config.php:33
+msgid "May"
+msgstr "5ì›”"
+
+#: js/config.php:33
+msgid "June"
+msgstr "6ì›”"
+
+#: js/config.php:33
+msgid "July"
+msgstr "7ì›”"
+
+#: js/config.php:33
+msgid "August"
+msgstr "8ì›”"
+
+#: js/config.php:33
+msgid "September"
+msgstr "9ì›”"
+
+#: js/config.php:33
+msgid "October"
+msgstr "10ì›”"
+
+#: js/config.php:33
+msgid "November"
+msgstr "11ì›”"
+
+#: js/config.php:33
+msgid "December"
+msgstr "12ì›”"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ì„¤ì •"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1ë¶„ ì „"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes}ë¶„ ì „"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1ì‹œê°„ ì „"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours}ì‹œê°„ ì „"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ì˜¤ëŠ˜"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "ì–´ì œ"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days}ì¼ ì „"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "ì§€ë‚œ ë‹¬"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months}ê°œì›” ì „"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "ê°œì›” ì „"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "ë…„ ì „"
 
@@ -165,8 +241,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "ì˜¤ë¥˜"
 
@@ -178,123 +254,141 @@ msgstr "ì•± ì´ë¦„ì´ ì§€ì •ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤."
 msgid "The required file {file} is not installed!"
 msgstr "í•„ìš”í•œ íŒŒì¼ {file}ì´(ê°€) ì„¤ì¹˜ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "ê³µìœ í•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "ê³µìœ  í•´ì œí•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "ê¶Œí•œ ë³€ê²½í•˜ëŠ” ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} ë‹˜ì´ ì—¬ëŸ¬ë¶„ ë° ê·¸ë£¹ {group}ì™€(ê³¼) ê³µìœ  ì¤‘"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "{owner} ë‹˜ì´ ê³µìœ  ì¤‘"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "ë‹¤ìŒìœ¼ë¡œ ê³µìœ "
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "URL ë§í¬ë¡œ ê³µìœ "
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "ì•”í˜¸ ë³´í˜¸"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ì•”í˜¸"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "ì´ë©”ì¼ ì£¼ì†Œ"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "ì „ì†¡"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ ì„¤ì •"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "ì´ë©”ì¼ë¡œ ê³µìœ :"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "ë°œê²¬ëœ ì‚¬ëžŒ ì—†ìŒ"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ë‹¤ì‹œ ê³µìœ í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "{user} ë‹˜ê³¼ {item}ì—ì„œ ê³µìœ  ì¤‘"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "ê³µìœ  í•´ì œ"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "íŽ¸ì§‘ ê°€ëŠ¥"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ì ‘ê·¼ ì œì–´"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "ë§Œë“¤ê¸°"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "ì—…ë°ì´íŠ¸"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "ì‚ì œ"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "ê³µìœ "
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "ì•”í˜¸ë¡œ ë³´í˜¸ë¨"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ í•´ì œ ì˜¤ë¥˜"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "ë§Œë£Œ ë‚ ì§œ ì„¤ì • ì˜¤ë¥˜"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "ì „ì†¡ ì¤‘..."
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud ì•”í˜¸ ìž¬ì„¤ì •"
@@ -446,87 +540,11 @@ msgstr "ë°ì´í„°ë² ì´ìŠ¤ í˜¸ìŠ¤íŠ¸"
 msgid "Finish setup"
 msgstr "ì„¤ì¹˜ ì™„ë£Œ"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "ì¼ìš”ì¼"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "ì›”ìš”ì¼"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "í™”ìš”ì¼"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "ìˆ˜ìš”ì¼"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "ëª©ìš”ì¼"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "ê¸ˆìš”ì¼"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "í† ìš”ì¼"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "1ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "2ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "3ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "4ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "5ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "6ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "7ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "8ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "9ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "10ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "11ì›”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "12ì›”"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "ë‚´ê°€ ê´€ë¦¬í•˜ëŠ” ì›¹ ì„œë¹„ìŠ¤"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "ë¡œê·¸ì•„ì›ƒ"
 
@@ -568,17 +586,3 @@ msgstr "ë‹¤ìŒ"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "ownCloud ë¥¼ ë²„ì ¼ %së¡œ ì—…ë°ì´íŠ¸ í•˜ëŠ” ì¤‘, ì‹œê°„ì´ ì†Œìš”ë©ë‹ˆë‹¤."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "ë³´ì•ˆ ê²½ê³ !"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "ì•”í˜¸ë¥¼ í™•ì¸í•´ ì£¼ì‹ì‹œì˜¤.<br/>ë³´ì•ˆìƒì˜ ì´ìœ ë¡œ ì¢…ì¢… ì•”í˜¸ë¥¼ ë¬¼ì–´ë³¼ ê²ƒìž…ë‹ˆë‹¤."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "í™•ì¸"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 724bb5fd2d90be2ecbb9cfd1655008d20df75c7e..86f4240c0a19cefd1b651e2975ab3ac96b871622 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 13:42+0000\n"
-"Last-Translator: Harim Park <fofwisdom@gmail.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -36,46 +36,46 @@ msgstr "%s í•ëª©ì„ ì´ë”©ì‹œí‚¤ì§€ ëª»í•˜ì˜€ìŒ"
 msgid "Unable to rename file"
 msgstr "íŒŒì¼ ì´ë¦„ë°”ê¾¸ê¸° í•  ìˆ˜ ì—†ìŒ"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "íŒŒì¼ì´ ì—…ë¡œë“œë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. ì•Œ ìˆ˜ ì—†ëŠ” ì˜¤ë¥˜ìž…ë‹ˆë‹¤"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "ì—…ë¡œë“œì— ì„±ê³µí•˜ì˜€ìŠµë‹ˆë‹¤."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ì—…ë¡œë“œí•œ íŒŒì¼ì´ php.iniì˜ upload_max_filesizeë³´ë‹¤ í½ë‹ˆë‹¤:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ì—…ë¡œë“œí•œ íŒŒì¼ì´ HTML ë¬¸ì„œì— ì§€ì •í•œ MAX_FILE_SIZEë³´ë‹¤ ë” í¼"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "íŒŒì¼ì´ ë¶€ë¶„ì ìœ¼ë¡œ ì—…ë¡œë“œë¨"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "ì—…ë¡œë“œëœ íŒŒì¼ ì—†ìŒ"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ìž„ì‹œ í´ë”ê°€ ì‚¬ë¼ì§"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ë””ìŠ¤í¬ì— ì“°ì§€ ëª»í–ˆìŠµë‹ˆë‹¤"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "ì—¬ìœ ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "ì˜¬ë°”ë¥´ì§€ ì•Šì€ ë””ë ‰í† ë¦¬ìž…ë‹ˆë‹¤."
 
@@ -83,11 +83,11 @@ msgstr "ì˜¬ë°”ë¥´ì§€ ì•Šì€ ë””ë ‰í† ë¦¬ìž…ë‹ˆë‹¤."
 msgid "Files"
 msgstr "íŒŒì¼"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "ê³µìœ  í•´ì œ"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "ì‚ì œ"
 
@@ -95,137 +95,151 @@ msgstr "ì‚ì œ"
 msgid "Rename"
 msgstr "ì´ë¦„ ë°”ê¾¸ê¸°"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name}ì´(ê°€) ì´ë¯¸ ì¡´ìž¬í•¨"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "ë°”ê¾¸ê¸°"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "ì´ë¦„ ì œì•ˆ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "ì·¨ì†Œ"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name}ì„(ë¥¼) ëŒ€ì²´í•¨"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "ì‹¤í–‰ ì·¨ì†Œ"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name}ì´(ê°€) {new_name}(ìœ¼)ë¡œ ëŒ€ì²´ë¨"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "{files} ê³µìœ  í•´ì œë¨"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} ì‚ì œë¨"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' ëŠ” ì˜¬ë°”ë¥´ì§€ ì•Šì€ íŒŒì¼ ì´ë¦„ ìž…ë‹ˆë‹¤."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "íŒŒì¼ì´ë¦„ì€ ê³µëž€ì´ ë  ìˆ˜ ì—†ìŠµë‹ˆë‹¤."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "í´ë” ì´ë¦„ì´ ì˜¬ë°”ë¥´ì§€ ì•ŠìŠµë‹ˆë‹¤. ì´ë¦„ì— ë¬¸ìž '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'ëŠ” ì‚¬ìš©í•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP íŒŒì¼ì„ ìƒì„±í•˜ê³  ìžˆìŠµë‹ˆë‹¤. ì‹œê°„ì´ ê±¸ë¦´ ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ì´ íŒŒì¼ì€ ë””ë ‰í„°ë¦¬ì´ê±°ë‚˜ ë¹„ì–´ ìžˆê¸° ë•Œë¬¸ì— ì—…ë¡œë“œí•  ìˆ˜ ì—†ìŠµë‹ˆë‹¤"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "ì—…ë¡œë“œ ì˜¤ë¥˜"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "ë‹«ê¸°"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ë³´ë¥˜ ì¤‘"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "íŒŒì¼ 1ê°œ ì—…ë¡œë“œ ì¤‘"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "íŒŒì¼ {count}ê°œ ì—…ë¡œë“œ ì¤‘"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ì—…ë¡œë“œê°€ ì·¨ì†Œë˜ì—ˆìŠµë‹ˆë‹¤."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "íŒŒì¼ ì—…ë¡œë“œê°€ ì§„í–‰ ì¤‘ìž…ë‹ˆë‹¤. ì´ íŽ˜ì´ì§€ë¥¼ ë²—ì–´ë‚˜ë©´ ì—…ë¡œë“œê°€ ì·¨ì†Œë©ë‹ˆë‹¤."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URLì„ ìž…ë ¥í•´ì•¼ í•©ë‹ˆë‹¤."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "í´ë” ì´ë¦„ì´ ìœ íš¨í•˜ì§€ ì•ŠìŠµë‹ˆë‹¤. "
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "íŒŒì¼ {count}ê°œ ê²€ìƒ‰ë¨"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "ê²€ìƒ‰ ì¤‘ ì˜¤ë¥˜ ë°œìƒ"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "ì´ë¦„"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "í¬ê¸°"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ìˆ˜ì •ë¨"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "í´ë” 1ê°œ"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "í´ë” {count}ê°œ"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "íŒŒì¼ 1ê°œ"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "íŒŒì¼ {count}ê°œ"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ì—…ë¡œë“œ"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "íŒŒì¼ ì²˜ë¦¬"
@@ -274,36 +288,32 @@ msgstr "í´ë”"
 msgid "From link"
 msgstr "ë§í¬ì—ì„œ"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ì—…ë¡œë“œ"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ì—…ë¡œë“œ ì·¨ì†Œ"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "ë‚´ìš©ì´ ì—†ìŠµë‹ˆë‹¤. ì—…ë¡œë“œí•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ë‹¤ìš´ë¡œë“œ"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "ì—…ë¡œë“œ ìš©ëŸ‰ ì´ˆê³¼"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ì´ íŒŒì¼ì´ ì„œë²„ì—ì„œ í—ˆìš©í•˜ëŠ” ìµœëŒ€ ì—…ë¡œë“œ ê°€ëŠ¥ ìš©ëŸ‰ë³´ë‹¤ í½ë‹ˆë‹¤."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "íŒŒì¼ì„ ê²€ìƒ‰í•˜ê³  ìžˆìŠµë‹ˆë‹¤. ê¸°ë‹¤ë ¤ ì£¼ì‹ì‹œì˜¤."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "í˜„ìž¬ ê²€ìƒ‰"
diff --git a/l10n/ko/files_encryption.po b/l10n/ko/files_encryption.po
index 7317bd55f1de90aefef208fe2e23136148ba30fa..441ba8cec4b6db02f6827333650821f8f26d9e0a 100644
--- a/l10n/ko/files_encryption.po
+++ b/l10n/ko/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:13+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
@@ -19,18 +19,66 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "ì•”í˜¸í™”"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "ë‹¤ìŒ íŒŒì¼ í˜•ì‹ì€ ì•”í˜¸í™”í•˜ì§€ ì•ŠìŒ"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "ì—†ìŒ"
-
-#: templates/settings.php:12
-msgid "Enable Encryption"
-msgstr "ì•”í˜¸í™” ì‚¬ìš©"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index 20d3071b54853e3b87266c2e2b02742e2ac6986c..0fe524b7701685c6fdf5c99b9a06f42e2765f3ce 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.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-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:11+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\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"
 "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"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "ëª¨ë“  ë²„ì „ ì‚ì œ"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "ì—ì‚¬"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "ë²„ì „"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "ì´ íŒŒì¼ì˜ ëª¨ë“  ë°±ì—… ë²„ì „ì„ ì‚ì œí•©ë‹ˆë‹¤"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "íŒŒì¼ ë²„ì „ ê´€ë¦¬"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 3870ebda87f69c05aa591224c41202d171008352..c759d43ece3639c96917c81ec65db9ea179575ab 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.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-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:06+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "ë„ì›€ë§"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "ê°œì¸"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "ì„¤ì •"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "ì‚¬ìš©ìž"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "ì•±"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "ê´€ë¦¬ìž"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP ë‹¤ìš´ë¡œë“œê°€ ë¹„í™œì„±í™”ë˜ì—ˆìŠµë‹ˆë‹¤."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "íŒŒì¼ì„ ê°œë³„ì ìœ¼ë¡œ ë‹¤ìš´ë¡œë“œí•´ì•¼ í•©ë‹ˆë‹¤."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "íŒŒì¼ë¡œ ëŒì•„ê°€ê¸°"
 
-#: files.php:386
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "ì¸ì¦ ì˜¤ë¥˜"
 
@@ -83,55 +87,55 @@ msgstr "í…ìŠ¤íŠ¸"
 msgid "Images"
 msgstr "ê·¸ë¦¼"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "ì´ˆ ì „"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1ë¶„ ì „"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%dë¶„ ì „"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1ì‹œê°„ ì „"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%dì‹œê°„ ì „"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ì˜¤ëŠ˜"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "ì–´ì œ"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%dì¼ ì „"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "ì§€ë‚œ ë‹¬"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%dê°œì›” ì „"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "ìž‘ë…„"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "ë…„ ì „"
 
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index cf07cd95284678940bd62bba55af9da644ac8abf..2236af6d9cd2fbd0f4be73d8a2b1f553b1ba3d63 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr "í™œì„±í™”"
 msgid "Saving..."
 msgstr "ì €ìž¥ ì¤‘..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "í•œêµì–´"
 
@@ -104,15 +104,15 @@ msgstr "ì•± ì¶”ê°€"
 msgid "More Apps"
 msgstr "ë” ë§Žì€ ì•±"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "ì•± ì„ íƒ"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.comì— ìžˆëŠ” ì•± íŽ˜ì´ì§€ë¥¼ ì°¸ê³ í•˜ì‹ì‹œì˜¤"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-ë¼ì´ì„ ìŠ¤ ë³´ìœ ìž <span class=\"author\"></span>"
 
@@ -161,7 +161,7 @@ msgstr "ì•ˆë“œë¡œì´ë“œ í´ë¼ì´ì–¸íŠ¸ ë‹¤ìš´ë¡œë“œ"
 msgid "Download iOS Client"
 msgstr "iOS í´ë¼ì´ì–¸íŠ¸ ë‹¤ìš´ë¡œë“œ"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ì•”í˜¸"
 
@@ -231,11 +231,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "ì´ë¦„"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "ê·¸ë£¹"
 
@@ -247,26 +247,30 @@ msgstr "ë§Œë“¤ê¸°"
 msgid "Default Storage"
 msgstr "ê¸°ë³¸ ì €ìž¥ì†Œ"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "ë¬´ì œí•œ"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "ê¸°íƒ€"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ê·¸ë£¹ ê´€ë¦¬ìž"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "ì €ìž¥ì†Œ"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "ê¸°ë³¸ê°’"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "ì‚ì œ"
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index f4012dc7305c078dad027fe43ffe71157f75015d..53b9f3b081f5a3cc9979b4a3e741f4649c768941 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/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-01-08 00:30+0100\n"
-"PO-Revision-Date: 2013-01-07 09:58+0000\n"
-"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -29,9 +29,9 @@ msgstr "<b>ê²½ê³ </b>user_ldap ì•±ê³¼ user_webdavauth ì•±ì€ í˜¸í™˜ë˜ì§€ ì•ŠìŠµ
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>ê²½ê³ </b>PHP LDAP ëª¨ë“ˆì´ ì„¤ì¹˜ë˜ì§€ ì•Šì•˜ìŠµë‹ˆë‹¤. ë°±ì—”ë“œê°€ ë™ìž‘í•˜ì§€ ì•Šì„ ê²ƒ ìž…ë‹ˆë‹¤. ì‹œìŠ¤í…œê´€ë¦¬ìžì—ê²Œ ìš”ì²í•˜ì—¬ í•´ë‹¹ ëª¨ë“ˆì„ ì„¤ì¹˜í•˜ì‹œê¸° ë°”ëžë‹ˆë‹¤."
+"<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 "Host"
@@ -46,6 +46,10 @@ msgstr "SSLì„ ì‚¬ìš©í•˜ëŠ” ê²½ìš°ê°€ ì•„ë‹ˆë¼ë©´ í”„ë¡œí† ì½œì„ ìž…ë ¥í•˜ì§€
 msgid "Base DN"
 msgstr "ê¸°ë³¸ DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "ê³ ê¸‰ íƒì—ì„œ ì‚¬ìš©ìž ë° ê·¸ë£¹ì— ëŒ€í•œ ê¸°ë³¸ DNì„ ì§€ì •í•  ìˆ˜ ìžˆìŠµë‹ˆë‹¤."
@@ -117,10 +121,18 @@ msgstr "í¬íŠ¸"
 msgid "Base User Tree"
 msgstr "ê¸°ë³¸ ì‚¬ìš©ìž íŠ¸ë¦¬"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "ê¸°ë³¸ ê·¸ë£¹ íŠ¸ë¦¬"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "ê·¸ë£¹-íšŒì› ì—°ê²°"
diff --git a/l10n/ko/user_webdavauth.po b/l10n/ko/user_webdavauth.po
index 7baa17ed715a4bc876abf6700b8e81409a3e6c81..bd135598c7ffcf9d5da949e35d6cffb1f955ab54 100644
--- a/l10n/ko/user_webdavauth.po
+++ b/l10n/ko/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-08 00:30+0100\n"
-"PO-Revision-Date: 2013-01-07 10:31+0000\n"
-"Last-Translator: aoiob4305 <aoiob4305@gmail.com>\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"
 "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"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloudëŠ” ì´ URLë¡œ ìœ ì € ì¸ì¦ì„ ë³´ë‚´ê²Œ ë˜ë©°, http 401 ê³¼ http 403ì€ ì¸ì¦ ì˜¤ë¥˜ë¡œ, ê·¸ ì™¸ ì½”ë“œëŠ” ì¸ì¦ì´ ì˜¬ë°”ë¥¸ ê²ƒìœ¼ë¡œ í•´ì„í•©ë‹ˆë‹¤."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 1362878bd67bdc6d7f17b9f11bab41b94d3d4009..b06563d75384b34397040223911077e731b63230 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:33
+msgid "January"
+msgstr ""
+
+#: js/config.php:33
+msgid "February"
+msgstr ""
+
+#: js/config.php:33
+msgid "March"
+msgstr ""
+
+#: js/config.php:33
+msgid "April"
+msgstr ""
+
+#: js/config.php:33
+msgid "May"
+msgstr ""
+
+#: js/config.php:33
+msgid "June"
+msgstr ""
+
+#: js/config.php:33
+msgid "July"
+msgstr ""
+
+#: js/config.php:33
+msgid "August"
+msgstr ""
+
+#: js/config.php:33
+msgid "September"
+msgstr ""
+
+#: js/config.php:33
+msgid "October"
+msgstr ""
+
+#: js/config.php:33
+msgid "November"
+msgstr ""
+
+#: js/config.php:33
+msgid "December"
+msgstr ""
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒ"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Ù‡Ù‡â€ŒÚµÙ‡"
 
@@ -175,123 +251,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -443,87 +537,11 @@ msgstr "Ù‡Û†Ø³ØªÛŒ Ø¯Ø§ØªØ§Ø¨Ù‡â€ŒÛŒØ³"
 msgid "Finish setup"
 msgstr "ÙƒÛ†ØªØ§ÛŒÛŒ Ù‡Ø§Øª Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒÙ‡â€ŒÙƒØ§Ù†"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr ""
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Ú•Ø§Ú˜Ù‡â€ŒÛŒ ÙˆÛŽØ¨ Ù„Ù‡â€ŒÚ˜ÛŽØ± Ú†Ø§ÙˆØ¯ÛŽØ±ÛŒØª Ø¯Ø§ÛŒÙ‡"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Ú†ÙˆÙˆÙ†Û•Ø¯Û•Ø±Û•ÙˆÛ•"
 
@@ -565,17 +583,3 @@ msgstr "Ø¯ÙˆØ§ØªØ±"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index e85f7e1304505ebd6b2dc0fd5ee0c10b1f7ae118..b3b16e0bc71e4cdff13bac863b4af1c9463d6f15 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -31,46 +31,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -78,11 +78,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr ""
 
@@ -90,137 +90,151 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Ø¯Ø§Ø®Ø³ØªÙ†"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Ù†Ø§ÙˆÙ†ÛŒØ´Ø§Ù†ÛŒ Ø¨Ù‡â€ŒØ³ØªÙ‡â€ŒØ± Ù†Ø§Ø¨ÛŽØª Ø¨Ù‡â€ŒØªØ§Úµ Ø¨ÛŽØª."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ù†Ø§Ùˆ"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr ""
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -269,36 +283,32 @@ msgstr "Ø¨ÙˆØ®Ú†Ù‡"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ø¨Ø§Ø±Ú©Ø±Ø¯Ù†"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Ø¯Ø§Ú¯Ø±ØªÙ†"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ku_IQ/files_encryption.po b/l10n/ku_IQ/files_encryption.po
index ebb1c844374cdfffc5f5bc00cb0e5525427532db..d372d58b033b87bde5e4c1173d6159c64b728a6a 100644
--- a/l10n/ku_IQ/files_encryption.po
+++ b/l10n/ku_IQ/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-08 02:02+0200\n"
-"PO-Revision-Date: 2012-10-07 00:06+0000\n"
-"Last-Translator: Hozha Koyi <hozhan@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Ù†Ù‡ÛŽÙ†ÛŒÚ©Ø±Ø¯Ù†"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ø¨Ù‡â€ŒØ±Ø¨Ù‡â€ŒØ³Øª Ú©Ø±Ø¯Ù†ÛŒ Ø¦Ù‡â€ŒÙ… Ø¬Û†Ø±Ù‡â€Œ Ù¾Ù‡â€ŒÚ•Ú¯Ø§Ù†Ù‡ Ù„Ù‡â€Œ Ù†Ù‡ÛŽÙ†ÛŒÚ©Ø±Ø¯Ù†"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ù‡ÛŒÚ†"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Ú†Ø§Ù„Ø§Ú©Ø±Ø¯Ù†ÛŒ Ù†Ù‡ÛŽÙ†ÛŒÚ©Ø±Ø¯Ù†"
diff --git a/l10n/ku_IQ/files_versions.po b/l10n/ku_IQ/files_versions.po
index 89832609b9cf59d15bbc88c4c2e589b60f57291a..b3fa1af6357b8cd90832f0ad93d5d156353d8bc6 100644
--- a/l10n/ku_IQ/files_versions.po
+++ b/l10n/ku_IQ/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: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-10-07 00:02+0000\n"
-"Last-Translator: Hozha Koyi <hozhan@gmail.com>\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "ÙˆÙ‡â€ŒØ´Ø§Ù†Ù‡â€ŒÚ©Ø§Ù† Ú¯Ø´ØªÛŒØ§Ù† Ø¨Ù‡â€ŒØ³Ù‡â€ŒØ±Ø¯Ù‡â€ŒÚ†Ù†"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Ù…ÛŽÚ˜ÙˆÙˆ"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "ÙˆÙ‡â€ŒØ´Ø§Ù†"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Ø¦Ù‡â€ŒÙ…Ù‡â€Œ Ø³Ù‡â€ŒØ±Ø¬Ù‡â€ŒÙ… Ù¾Ø§ÚµÙ¾Ø´ØªÛŒ ÙˆÙ‡â€ŒØ´Ø§Ù†Ù‡â€Œ Ù‡Ù‡â€ŒØ¨ÙˆÙˆÙ‡â€ŒÚ©Ø§Ù†ÛŒ Ù¾Ù‡â€ŒÚ•Ú¯Ù‡â€ŒÚ©Ø§Ù†Øª Ø¯Ù‡â€ŒØ³Ú•ÛŒÙ†ØªÙ‡â€ŒÙˆÙ‡"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "ÙˆÙ‡â€ŒØ´Ø§Ù†ÛŒ Ù¾Ù‡â€ŒÚ•Ú¯Ù‡"
diff --git a/l10n/ku_IQ/lib.po b/l10n/ku_IQ/lib.po
index ab5cb3ada24d3db306d1d908566d61bffcfcc4b1..64ee0185d35dcabb78ef321cc64526b701a45f2c 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "ÛŒØ§Ø±Ù…Û•ØªÛŒ"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr ""
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Ø¯Ù‡â€ŒØ³ØªÙƒØ§Ø±ÛŒ"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Ø¨Ù‡â€ŒÙƒØ§Ø±Ù‡ÛŽÙ†Ù‡â€ŒØ±"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index 75dbd11b7bc438d745d62c7a49b0ba2f442a2f88..db582696a957a1430b163705088c35de9ed9c092 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -87,7 +87,7 @@ msgstr "Ú†Ø§Ù„Ø§Ú©Ú©Ø±Ø¯Ù†"
 msgid "Saving..."
 msgstr "Ù¾Ø§Ø´Ú©Ù‡â€ŒÙˆØªØ¯Ù‡â€ŒÚ©Ø§Øª..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr ""
 
@@ -99,15 +99,15 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ"
 
@@ -226,11 +226,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ù†Ø§Ùˆ"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr ""
 
@@ -242,26 +242,30 @@ msgstr ""
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr ""
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index f4e484f84f792bdfa11033f0c9c2d6d4b00092a6..a6c602241181dc6b3d908db1a3ce25a41d43186b 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "ÛŒØ§Ø±Ù…Û•ØªÛŒ"
diff --git a/l10n/ku_IQ/user_webdavauth.po b/l10n/ku_IQ/user_webdavauth.po
index 57ded88a09b15bba62bcac21697a300f1511db64..313845a14b2bd9718456ba7921a65ce8474d3d1f 100644
--- a/l10n/ku_IQ/user_webdavauth.po
+++ b/l10n/ku_IQ/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: ku_IQ\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/lb/core.po b/l10n/lb/core.po
index b8f03766595adf6ec786cefd58ad46d0c18ab826..cf61dda08ca68a239c07bb8bcedfb140edc4ac47 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <sim0n@trypill.org>, 2013.
 #   <sim0n@trypill.org>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +19,24 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,65 +81,141 @@ msgstr "Keng Kategorien ausgewielt fir ze lÃ¤schen."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Sonndes"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "MÃ©indes"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "DÃ«nschdes"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "MÃ«ttwoch"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Donneschdes"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Freides"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Samschdes"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "MÃ¤erz"
+
+#: js/config.php:33
+msgid "April"
+msgstr "AbrÃ«ll"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mee"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Dezember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
-msgstr ""
+msgstr "vrun 1 Stonn"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "vru {hours} Stonnen"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
-msgstr ""
+msgstr "LÃ¤schte Mount"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
-msgstr ""
+msgstr "vru {months} MÃ©int"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
-msgstr ""
+msgstr "MÃ©int hier"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
-msgstr ""
+msgstr "LÃ¤scht Joer"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
-msgstr ""
+msgstr "Joren hier"
 
 #: js/oc-dialogs.js:126
 msgid "Choose"
-msgstr ""
+msgstr "Auswielen"
 
 #: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
@@ -162,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Fehler"
 
@@ -175,123 +252,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Passwuert"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
-msgstr ""
+msgstr "Net mÃ©i deelen"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
-msgstr ""
+msgstr "lÃ¤schen"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
-msgstr ""
+msgstr "deelen"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud Passwuert reset"
@@ -404,7 +499,7 @@ msgstr "En <strong>Admin Account</strong> uleeÃ«n"
 
 #: templates/installation.php:50
 msgid "Advanced"
-msgstr "Advanced"
+msgstr "AvancÃ©iert"
 
 #: templates/installation.php:52
 msgid "Data folder"
@@ -443,87 +538,11 @@ msgstr "Datebank Server"
 msgid "Finish setup"
 msgstr "Installatioun ofschlÃ©issen"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Sonndes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "MÃ©indes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "DÃ«nschdes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "MÃ«ttwoch"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Donneschdes"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Freides"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Samschdes"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "MÃ¤erz"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "AbrÃ«ll"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mee"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Dezember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Web Servicer Ã«nnert denger Kontroll"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Ausloggen"
 
@@ -565,17 +584,3 @@ msgstr "weider"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index e664d38cc359795d8c59f5c96eac4fef7bd8dffb..89400d8476837b9a561ce07f8fb98ccd9c94dceb 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -32,46 +32,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Keen Feeler, Datei ass komplett ropgelueden ginn"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "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:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "DÃ©i ropgelueden Datei ass nÃ«mmen hallef ropgelueden ginn"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Et ass keng Datei ropgelueden ginn"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Et feelt en temporÃ¤ren Dossier"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Konnt net op den Disk schreiwen"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -79,11 +79,11 @@ msgstr ""
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
-msgstr ""
+msgstr "Net mÃ©i deelen"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "LÃ¤schen"
 
@@ -91,137 +91,151 @@ msgstr "LÃ¤schen"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "rÃ©ckgÃ¤ngeg man"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Et  gÃ«tt eng ZIP-File generÃ©iert, dÃ«st ka bÃ«ssen daueren."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Fehler beim eroplueden"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Zoumaachen"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Numm"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "GrÃ©isst"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "GeÃ¤nnert"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Eroplueden"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Fichier handling"
@@ -270,36 +284,32 @@ msgstr "Dossier"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Eroplueden"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass nÃ¤ischt. Lued eppes rop!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Momentane Scan"
diff --git a/l10n/lb/files_encryption.po b/l10n/lb/files_encryption.po
index 5446d2366b419ae4ad10f9ed95a1d2c1348a53ae..f88e884164b71d1c2db2401d6c217dd131169aa2 100644
--- a/l10n/lb/files_encryption.po
+++ b/l10n/lb/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lb\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index ebdb3f59320de48b60be3fcb274b97216c1373fd..f4d8ed5cc8e85775441ca990017684a46740a213 100644
--- a/l10n/lb/files_sharing.po
+++ b/l10n/lb/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 13:36+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,27 +19,27 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Passwuert"
 
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:11
 #, 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:16 templates/public.php:32
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:31
 msgid "No preview available for"
 msgstr ""
 
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 9f3294d11f69721bbc3a81763bf0ead1191097cf..3eeeda4f0635e9b4247671892ed36fe24276d8ee 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <sim0n@trypill.org>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 12:27+0000\n"
+"Last-Translator: sim0n <sim0n@trypill.org>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,26 +18,14 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
-msgstr ""
-
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Historique"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
-msgstr ""
+msgstr "Fichier's VersionÃ©ierung "
 
 #: templates/settings.php:4
 msgid "Enable"
-msgstr ""
+msgstr "Aschalten"
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index b164e98f222dd52110c48475fcc9f1d4f0d71286..b7995af6442a4d6bac3226a757f0dc3fade48819 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 13:36+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,51 +17,55 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
-msgstr ""
+msgstr "HÃ«llef"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "PersÃ©inlech"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Astellungen"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr ""
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Authentifikatioun's Fehler"
 
@@ -71,7 +75,7 @@ msgstr ""
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
-msgstr ""
+msgstr "Dateien"
 
 #: search/provider/file.php:26 search/provider/file.php:33
 msgid "Text"
@@ -81,57 +85,57 @@ msgstr "SMS"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
-msgstr ""
+msgstr "vrun 1 Stonn"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
-msgstr ""
+msgstr "LÃ¤schte Mount"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
-msgstr ""
+msgstr "LÃ¤scht Joer"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
-msgstr ""
+msgstr "Joren hier"
 
 #: updater.php:75
 #, php-format
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 2bb5692c231d18e6609767d48d63715e837041db..ffe1d795a65696fcc510841ce489c6ad83495fd7 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "Aschalten"
 msgid "Saving..."
 msgstr "Speicheren..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -100,15 +100,15 @@ msgstr "Setz deng App bei"
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Wiel eng Applikatioun aus"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Kuck dir d'Applicatioun's SÃ¤it op apps.owncloud.com un"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -157,7 +157,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passwuert"
 
@@ -227,11 +227,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Numm"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Gruppen"
 
@@ -243,26 +243,30 @@ msgstr "Erstellen"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Aner"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppen Admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "LÃ¤schen"
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index be1657cb3d3c024534888a4a2357293f35955e31..b48c76aa9b2634e41c321274469524deef0cb75d 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 13:36+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"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -60,7 +64,7 @@ msgstr ""
 
 #: templates/settings.php:18
 msgid "Password"
-msgstr ""
+msgstr "Passwuert"
 
 #: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "HÃ«llef"
diff --git a/l10n/lb/user_webdavauth.po b/l10n/lb/user_webdavauth.po
index 626112fb833757de03e4a4145c9c1cb72ddf1823..fb53f7bcb242265334ddc4ae78f4ad953e2887fc 100644
--- a/l10n/lb/user_webdavauth.po
+++ b/l10n/lb/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: lb\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/lt_LT/core.po b/l10n/lt_LT/core.po
index d920fe7b4767b0945ccd83fcb85e367cc809a41c..a6aff9a772f5099f3021d196cc280ac552c1a309 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,59 +81,135 @@ msgstr "Trynimui nepasirinkta jokia kategorija."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Sekmadienis"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Pirmadienis"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Antradienis"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "TreÄiadienis"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ketvirtadienis"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Penktadienis"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Å eÅ¡tadienis"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Sausis"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Vasaris"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Kovas"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Balandis"
+
+#: js/config.php:33
+msgid "May"
+msgstr "GeguÅ¾Ä—"
+
+#: js/config.php:33
+msgid "June"
+msgstr "BirÅ¾elis"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Liepa"
+
+#: js/config.php:33
+msgid "August"
+msgstr "RugpjÅ«tis"
+
+#: js/config.php:33
+msgid "September"
+msgstr "RugsÄ—jis"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Spalis"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Lapkritis"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Gruodis"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "prieÅ¡ sekundÄ™"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "PrieÅ¡ 1 minutÄ™"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "PrieÅ¡ {count} minutes"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Å¡iandien"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "PrieÅ¡ {days}  dienas"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "praeitÄ… mÄ—nesÄ¯"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "prieÅ¡ mÄ—nesÄ¯"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "prieÅ¡ metus"
 
@@ -163,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Klaida"
 
@@ -176,123 +252,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Klaida, kai atÅ¡aukiamas dalijimasis"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Klaida, keiÄiant privilegijas"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Pasidalino su Jumis {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Dalintis su"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Dalintis nuoroda"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Apsaugotas slaptaÅ¾odÅ¾iu"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "SlaptaÅ¾odis"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Nustatykite galiojimo laikÄ…"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Galiojimo laikas"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Dalintis per el. paÅ¡tÄ…:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Å½moniÅ³ nerasta"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Dalijinasis iÅ¡naujo negalimas"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Pasidalino {item} su {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Nesidalinti"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "gali redaguoti"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "priÄ—jimo kontrolÄ—"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "sukurti"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "atnaujinti"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "iÅ¡trinti"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Apsaugota slaptaÅ¾odÅ¾iu"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laikÄ…"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laikÄ…"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud slaptaÅ¾odÅ¾io atkÅ«rimas"
@@ -444,87 +538,11 @@ msgstr "DuomenÅ³ bazÄ—s serveris"
 msgid "Finish setup"
 msgstr "Baigti diegimÄ…"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Sekmadienis"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Pirmadienis"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Antradienis"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "TreÄiadienis"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Ketvirtadienis"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Penktadienis"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Å eÅ¡tadienis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Sausis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Vasaris"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Kovas"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Balandis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "GeguÅ¾Ä—"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "BirÅ¾elis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Liepa"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "RugpjÅ«tis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "RugsÄ—jis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Spalis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Lapkritis"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Gruodis"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "jÅ«sÅ³ valdomos web paslaugos"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Atsijungti"
 
@@ -566,17 +584,3 @@ msgstr "kitas"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Saugumo praneÅ¡imas!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "PraÅ¡ome patvirtinti savo vartotojÄ….<br/>DÄ—l saugumo, slaptaÅ¾odÅ¾io patvirtinimas bus reikalaujamas Ä¯vesti kas kiek laiko."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Patvirtinti"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 0b5d2d78f5b1ba62c90a80cca1d38d05beb481c0..ade78b178967f48f85cdd593fb17d9f1f81a44f6 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -34,46 +34,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "KlaidÅ³ nÄ—ra, failas Ä¯keltas sÄ—kmingai"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ä®keliamo failo dydis virÅ¡ija MAX_FILE_SIZE parametrÄ…, kuris yra nustatytas HTML formoje"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Failas buvo Ä¯keltas tik dalinai"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Nebuvo Ä¯keltas nÄ— vienas failas"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "NÄ—ra laikinojo katalogo"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Nepavyko Ä¯raÅ¡yti Ä¯ diskÄ…"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -81,11 +81,11 @@ msgstr ""
 msgid "Files"
 msgstr "Failai"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Nebesidalinti"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "IÅ¡trinti"
 
@@ -93,137 +93,151 @@ msgstr "IÅ¡trinti"
 msgid "Rename"
 msgstr "Pervadinti"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} jau egzistuoja"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "pakeisti"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "pasiÅ«lyti pavadinimÄ…"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "atÅ¡aukti"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "pakeiskite {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "anuliuoti"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "pakeiskite {new_name} Ä¯ {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "nebesidalinti {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "iÅ¡trinti {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "kuriamas ZIP archyvas, tai gali uÅ¾trukti Å¡iek tiek laiko."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Ä®kÄ—limo klaida"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "UÅ¾verti"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Ä¯keliamas 1 failas"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count}  Ä¯keliami failai"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Ä®kÄ—limas atÅ¡auktas."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count}  praskanuoti failai"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "klaida skanuojant"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 aplankalas"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} aplankalai"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 failas"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} failai"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Ä®kelti"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "FailÅ³ tvarkymas"
@@ -272,36 +286,32 @@ msgstr "Katalogas"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ä®kelti"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "AtÅ¡aukti siuntimÄ…"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "ÄŒia tuÅ¡Äia. Ä®kelkite kÄ… nors!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "AtsisiÅ³sti"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Ä®kÄ—limui failas per didelis"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, praÅ¡ome palaukti."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Å iuo metu skenuojama"
diff --git a/l10n/lt_LT/files_encryption.po b/l10n/lt_LT/files_encryption.po
index 41529366d31bbfc50691bfd210ed24d38146fffc..152f3677f830a4c1b9630b1c2fd58c7e8c56601d 100644
--- a/l10n/lt_LT/files_encryption.po
+++ b/l10n/lt_LT/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 12:29+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Å ifravimas"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "NeÅ¡ifruoti pasirinkto tipo failÅ³"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Nieko"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Ä®jungti Å¡ifravimÄ…"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 2e5b37e12fcf5a99bf335edcacd76f1d320b4963..b3cf7ff9e978ab8b5ef9a628ced95a88ec2d37a9 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.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-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 16:56+0000\n"
-"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Panaikinti visÅ³ versijÅ³ galiojimÄ…"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Istorija"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versijos"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Tai iÅ¡trins visas esamas failo versijas"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "FailÅ³ versijos"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 8ef5110cd74133cfbec86e588b4ec87adef2ed3d..1f676fdd4ec966b1288da74ff9f7bce44075183a 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,51 +19,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "Pagalba"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Vartotojai"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Programos"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Administravimas"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybÄ— yra iÅ¡jungta."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi bÅ«ti parsiunÄiami vienas po kito."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Atgal Ä¯ Failus"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui Ä¯ ZIP."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Programa neÄ¯jungta"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Autentikacijos klaida"
 
@@ -83,55 +87,55 @@ msgstr "Å½inuÄiÅ³"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "prieÅ¡ kelias sekundes"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "prieÅ¡ 1 minutÄ™"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "prieÅ¡ %d minuÄiÅ³"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Å¡iandien"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "vakar"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "prieÅ¡ %d dienÅ³"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "praÄ—jusÄ¯ mÄ—nesÄ¯"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "pereitais metais"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "prieÅ¡ metus"
 
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 91d9a303f5e9aaac2f6c8bf892c7bd8639b89ec2..4c4d82e432c9f7bd33bde50fc2d369822f0875a4 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Ä®jungti"
 msgid "Saving..."
 msgstr "Saugoma.."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Kalba"
 
@@ -101,15 +101,15 @@ msgstr "PridÄ—ti programÄ—lÄ™"
 msgid "More Apps"
 msgstr "Daugiau aplikacijÅ³"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Pasirinkite programÄ…"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
 
@@ -158,7 +158,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "SlaptaÅ¾odis"
 
@@ -228,11 +228,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Vardas"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "GrupÄ—s"
 
@@ -244,26 +244,30 @@ msgstr "Sukurti"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Kita"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "IÅ¡trinti"
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 9891d24f37223677f9b89dd84fe554fd0b0aab49..0abf2d8c2fdf8607f338edecd3944ac4e3b7e026 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr "Prievadas"
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/lt_LT/user_webdavauth.po b/l10n/lt_LT/user_webdavauth.po
index d49191051875c17f209d8ee3d238a9a121c8f4c6..f8bc059ae29c091d54d46eaaec558dae15c7d3b6 100644
--- a/l10n/lt_LT/user_webdavauth.po
+++ b/l10n/lt_LT/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: lt_LT\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr ""
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/lv/core.po b/l10n/lv/core.po
index 6294f8854c94d3404cee5f4c0a0829c59d400510..723dfe3b85402cc03545f9def75154159bdc27f0 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "SvÄ“tdiena"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Pirmdiena"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Otrdiena"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "TreÅ¡diena"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ceturtdiena"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Piektdiena"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Sestdiena"
+
+#: js/config.php:33
+msgid "January"
+msgstr "JanvÄris"
+
+#: js/config.php:33
+msgid "February"
+msgstr "FebruÄris"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Marts"
+
+#: js/config.php:33
+msgid "April"
+msgstr "AprÄ«lis"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maijs"
+
+#: js/config.php:33
+msgid "June"
+msgstr "JÅ«nijs"
+
+#: js/config.php:33
+msgid "July"
+msgstr "JÅ«lijs"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Augusts"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Septembris"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktobris"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembris"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Decembris"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "IestatÄ«jumi"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -142,7 +218,7 @@ msgstr ""
 
 #: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
-msgstr ""
+msgstr "Atcelt"
 
 #: js/oc-dialogs.js:162
 msgid "No"
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "KÄ¼Å«me"
 
@@ -175,123 +251,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Parole"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "PÄrtraukt lÄ«dzdalÄ«Å¡anu"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -443,87 +537,11 @@ msgstr "DatubÄzes mÄjvieta"
 msgid "Finish setup"
 msgstr "Pabeigt uzstÄdÄ«jumus"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr ""
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Izlogoties"
 
@@ -565,17 +583,3 @@ msgstr "nÄkamÄ"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 7b978c86d82b8c3ffb58444d0c374561ca09a71f..f5fb737c58498d796ce89ff7671d48a9a2190306 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Viss kÄrtÄ«bÄ, augÅ¡upielÄde veiksmÄ«ga"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Neviens fails netika augÅ¡uplÄdÄ“ts"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "TrÅ«kst pagaidu mapes"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Nav iespÄ“jams saglabÄt"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Files"
 msgstr "Faili"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "PÄrtraukt lÄ«dzdalÄ«Å¡anu"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "IzdzÄ“st"
 
@@ -92,137 +92,151 @@ msgstr "IzdzÄ“st"
 msgid "Rename"
 msgstr "PÄrdÄ“vÄ“t"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Ieteiktais nosaukums"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "vienu soli atpakaÄ¼"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "lai uzÄ£enerÄ“tu ZIP failu, kÄds brÄ«dis ir jÄpagaida"
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Nav iespÄ“jams augÅ¡uplÄdÄ“t jÅ«su failu, jo tÄds jau eksistÄ“ vai arÄ« failam nav izmÄ“ra (0 baiti)"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "AugÅ¡uplÄdÄ“Å¡anas laikÄ radÄs kÄ¼Å«da"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Gaida savu kÄrtu"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "AugÅ¡uplÄde ir atcelta"
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nosaukums"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "IzmÄ“rs"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "IzmainÄ«ts"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "AugÅ¡uplÄdet"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Failu pÄrvaldÄ«ba"
@@ -271,36 +285,32 @@ msgstr "Mape"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "AugÅ¡uplÄdet"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Atcelt augÅ¡uplÄdi"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Te vÄ“l nekas nav. RÄ«kojies, sÄc augÅ¡uplÄdÄ“t"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "LejuplÄdÄ“t"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Fails ir par lielu lai to augÅ¡uplÄdetu"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "JÅ«su augÅ¡uplÄdÄ“jamie faili pÄrsniedz servera pieÄ¼aujamo failu augÅ¡upielÄdes apjomu"
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Faili Å¡obrÄ«d tiek caurskatÄ«ti, nedaudz jÄpagaida."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Å obrÄ«d tiek pÄrbaudÄ«ti"
diff --git a/l10n/lv/files_encryption.po b/l10n/lv/files_encryption.po
index 6b2dc7673d72c2779b4e96ef693cb1b654dc9421..9ceadebe30cc9ae004ad869bd6e77c0576972d90 100644
--- a/l10n/lv/files_encryption.po
+++ b/l10n/lv/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 8f4cc2911f8a0b89ef86a2ecb98ca5083fbf5eb4..399b82e06fc86f3383959d95d1a47531c47e54fd 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 8ef8b7d506081c4a52daa882cc297744b719361f..03dc8d418c3dc51e414a02f062504c5edb6f7576 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "PalÄ«dzÄ«ba"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "PersonÄ«gi"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "IestatÄ«jumi"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "LietotÄji"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "IelogoÅ¡anÄs kÄ¼Å«me"
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 796d46f705e8aee81c6a19e8e47359c9240fd41c..afc2514715e7c970a255b9168383a3113d1f0c50 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Pievienot"
 msgid "Saving..."
 msgstr "SaglabÄ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__valodas_nosaukums__"
 
@@ -101,15 +101,15 @@ msgstr "Pievieno savu aplikÄciju"
 msgid "More Apps"
 msgstr "VairÄk aplikÄciju"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "IzvÄ“lies aplikÄciju"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Apskatie aplikÄciju lapu - apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencÄ“ts no <span class=\"author\"></span>"
 
@@ -144,7 +144,7 @@ msgstr "JÅ«s lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>"
 
 #: templates/personal.php:12
 msgid "Clients"
-msgstr ""
+msgstr "Klienti"
 
 #: templates/personal.php:13
 msgid "Download Desktop Clients"
@@ -158,7 +158,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Parole"
 
@@ -228,11 +228,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "VÄrds"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupas"
 
@@ -244,26 +244,30 @@ msgstr "Izveidot"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Cits"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupas administrators"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "IzdzÄ“st"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index b0d8f36bed33c949553c3d2a4dd8fedaac7db3f3..737869b743ea3200a8d7436300a6cc91a35417c9 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "PalÄ«dzÄ«ba"
diff --git a/l10n/lv/user_webdavauth.po b/l10n/lv/user_webdavauth.po
index c2af7da931a87aa9041212fec589188507967dd5..6d3874a0c53edb6e2e619e9ad6c3cea7be931adf 100644
--- a/l10n/lv/user_webdavauth.po
+++ b/l10n/lv/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr ""
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/mk/core.po b/l10n/mk/core.po
index dc83a622e0c7cc5d16cbb47bd72cdac2e6edd046..a6cc634a953f9188ab6823d9e869a509f084641e 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ¾Ñ‚ %s ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÑÐ¾ Ð’Ð°Ñ"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸ÐºÐ¾Ñ‚ %s ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð°Ð¿ÐºÐ° ÑÐ¾ Ð’Ð°Ñ"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +82,135 @@ msgstr "ÐÐµ Ðµ Ð¾Ð´Ð±Ñ€Ð°Ð½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° Ð·Ð° Ð±Ñ€Ð¸ÑˆÐµÑšÐµ."
 msgid "Error removing %s from favorites."
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð±Ñ€Ð¸ÑˆÐµÑšÐµ Ð½Ð° %s Ð¾Ð´ Ð¾Ð¼Ð¸Ð»ÐµÐ½Ð¸."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "ÐÐµÐ´ÐµÐ»Ð°"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»Ð½Ð¸Ðº"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Ð¡Ñ€ÐµÐ´Ð°"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð¾Ðº"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "ÐŸÐµÑ‚Ð¾Ðº"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Ð¡Ð°Ð±Ð¾Ñ‚Ð°"
+
+#: js/config.php:33
+msgid "January"
+msgstr "ÐˆÐ°Ð½ÑƒÐ°Ñ€Ð¸"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Ð¤ÐµÐ²Ñ€ÑƒÐ°Ñ€Ð¸"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ÐœÐ°Ñ€Ñ‚"
+
+#: js/config.php:33
+msgid "April"
+msgstr "ÐÐ¿Ñ€Ð¸Ð»"
+
+#: js/config.php:33
+msgid "May"
+msgstr "ÐœÐ°Ñ˜"
+
+#: js/config.php:33
+msgid "June"
+msgstr "ÐˆÑƒÐ½Ð¸"
+
+#: js/config.php:33
+msgid "July"
+msgstr "ÐˆÑƒÐ»Ð¸"
+
+#: js/config.php:33
+msgid "August"
+msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð²Ñ€Ð¸"
+
+#: js/config.php:33
+msgid "October"
+msgstr "ÐžÐºÑ‚Ð¾Ð¼Ð²Ñ€Ð¸"
+
+#: js/config.php:33
+msgid "November"
+msgstr "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²ÐºÐ¸"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€ÐµÐ´ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "Ð¿Ñ€ÐµÐ´ {minutes} Ð¼Ð¸Ð½ÑƒÑ‚Ð¸"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Ð¿Ñ€ÐµÐ´ 1 Ñ‡Ð°Ñ"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "Ð¿Ñ€ÐµÐ´ {hours} Ñ‡Ð°ÑÐ¾Ð²Ð¸"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Ð´ÐµÐ½ÐµÑÐºÐ°"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "Ð¿Ñ€ÐµÐ´ {days} Ð´ÐµÐ½Ð¾Ð²Ð¸"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð¸Ð¾Ñ‚ Ð¼ÐµÑÐµÑ†"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "Ð¿Ñ€ÐµÐ´ {months} Ð¼ÐµÑÐµÑ†Ð¸"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Ð¿Ñ€ÐµÐ´ Ð¼ÐµÑÐµÑ†Ð¸"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ð¿Ñ€ÐµÐ´ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
@@ -164,8 +240,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
@@ -177,123 +253,141 @@ msgstr "Ð˜Ð¼ÐµÑ‚Ð¾ Ð½Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°Ñ‚Ð° Ð½Ðµ Ðµ ÑÐ¿ÐµÑ†Ð¸Ñ„Ð¸Ñ†Ð¸Ñ€Ð°
 msgid "The required file {file} is not installed!"
 msgstr "Ð—Ð°Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÐµÐ»Ð½Ð°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° {file} Ð½Ðµ Ðµ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ð°!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐºÐ¸Ð½ Ð½Ð° ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð° Ð½Ð° Ð¿Ñ€Ð¸Ð²Ð¸Ð»ÐµÐ³Ð¸Ð¸"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ ÑÐ¾ Ð’Ð°Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð°Ñ‚Ð° {group} Ð¾Ð´ {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ ÑÐ¾ Ð’Ð°Ñ Ð¾Ð´ {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ ÑÐ¾"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ ÑÐ¾ Ð²Ñ€ÑÐºÐ°"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ‚Ð¸ ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "ÐŸÑ€Ð°Ñ‚Ð¸ Ð²Ñ€ÑÐºÐ° Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð° Ð»Ð¸Ñ‡Ð½Ð¾ÑÑ‚"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "ÐŸÑ€Ð°Ñ‚Ð¸"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ñ€Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Ð Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»Ð¸ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑˆÑ‚Ð°:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "ÐÐµ ÑÐµ Ð½Ð°Ñ˜Ð´ÐµÐ½Ð¸ Ð»ÑƒÑ“Ðµ"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐ¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ Ð½Ðµ Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¾"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Ð¡Ð¿Ð¾Ð´ÐµÐ»ÐµÐ½Ð¾ Ð²Ð¾ {item} ÑÐ¾ {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "ÐÐµ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°Ñ˜"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¸Ð·Ð¼ÐµÐ½Ð¸"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð° Ð½Ð° Ð¿Ñ€Ð¸ÑÑ‚Ð°Ð¿"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "ÐºÑ€ÐµÐ¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "ÑÐ¿Ð¾Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ‚ÐµÐ½Ð¾ ÑÐ¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ñ‚Ñ€Ð³Ð°ÑšÐµ Ð½Ð° Ñ€Ð¾ÐºÐ¾Ñ‚ Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ð¾ÑÑ‚Ð°Ð²ÑƒÐ²Ð°ÑšÐµ Ð½Ð° Ñ€Ð¾Ðº Ð½Ð° Ñ‚Ñ€Ð°ÐµÑšÐµ"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "ÐŸÑ€Ð°ÑœÐ°ÑšÐµ..."
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "Ñ€ÐµÑÐµÑ‚Ð¸Ñ€Ð°ÑšÐµ Ð½Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð·Ð° ownCloud"
@@ -445,87 +539,11 @@ msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ ÑÐ¾ Ð±Ð°Ð·Ð°"
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²Ñ€ÑˆÐ¸ Ð³Ð¾ Ð¿Ð¾Ð´ÐµÑÑƒÐ²Ð°ÑšÐµÑ‚Ð¾"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "ÐÐµÐ´ÐµÐ»Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»Ð½Ð¸Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Ð¡Ñ€ÐµÐ´Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð¾Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "ÐŸÐµÑ‚Ð¾Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Ð¡Ð°Ð±Ð¾Ñ‚Ð°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "ÐˆÐ°Ð½ÑƒÐ°Ñ€Ð¸"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Ð¤ÐµÐ²Ñ€ÑƒÐ°Ñ€Ð¸"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ÐœÐ°Ñ€Ñ‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "ÐÐ¿Ñ€Ð¸Ð»"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "ÐœÐ°Ñ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "ÐˆÑƒÐ½Ð¸"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "ÐˆÑƒÐ»Ð¸"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð²Ñ€Ð¸"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "ÐžÐºÑ‚Ð¾Ð¼Ð²Ñ€Ð¸"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "ÐÐ¾ÐµÐ¼Ð²Ñ€Ð¸"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Ð”ÐµÐºÐµÐ¼Ð²Ñ€Ð¸"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ Ð’Ð°ÑˆÐ° ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð°"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "ÐžÐ´Ñ˜Ð°Ð²Ð°"
 
@@ -567,17 +585,3 @@ msgstr "ÑÐ»ÐµÐ´Ð½Ð¾"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Ð‘ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð¾ Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ´ÑƒÐ²Ð°ÑšÐµ."
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Ð’Ðµ Ð¼Ð¾Ð»Ð°Ð¼ Ð¿Ð¾Ñ‚Ð²Ñ€Ð´ÐµÑ‚Ðµ Ñ˜Ð° Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ°. <br />ÐžÐ´ Ð±ÐµÐ·Ð±ÐµÐ´Ð½Ð¾ÑÐ½Ð¸ Ð¿Ñ€Ð¸Ñ‡Ð¸Ð½Ð¸ Ð¾Ð´ Ð²Ñ€ÐµÐ¼Ðµ Ð½Ð° Ð²Ñ€ÐµÐ¼Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ð¸Ð´Ðµ Ð¿Ð¾Ð±Ð°Ñ€Ð°Ð½Ð¾ Ð´Ð° Ñ˜Ð° Ð²Ð½ÐµÑÐµÑ‚Ðµ Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð»Ð¾Ð·Ð¸Ð½ÐºÐ° Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 5c3bf733238b44a34af08c5bcf3245daa66bf562..875893ff2ab955e2836352cb16a87fcd6f97787b 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -34,46 +34,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "ÐÐ¸Ñ‚Ñƒ ÐµÐ´ÐµÐ½ Ñ„Ð°Ñ˜Ð» Ð½Ðµ ÑÐµ Ð²Ñ‡Ð¸Ñ‚Ð°. ÐÐµÐ¿Ð¾Ð·Ð½Ð°Ñ‚Ð° Ð³Ñ€ÐµÑˆÐºÐ°"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "ÐÐµÐ¼Ð° Ð³Ñ€ÐµÑˆÐºÐ°, Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° Ð±ÐµÑˆÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð½Ð°Ñ‚Ð° ÑƒÑÐ¿ÐµÑˆÐ½Ð¾"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ÐŸÐ¾Ð´Ð¸Ð³Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜Ð° Ð½Ð°Ð´Ð¼Ð¸Ð½ÑƒÐ²Ð° upload_max_filesize Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð°Ñ‚Ð° Ð²Ð¾ php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ÐŸÐ¾Ð´Ð¸Ð³Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° Ñ˜Ð° Ð½Ð°Ð´Ð¼Ð¸Ð½ÑƒÐ²Ð° MAX_FILE_SIZE Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ð°Ñ‚Ð° ÐºÐ¾Ñ˜Ð° Ð±ÐµÑˆÐµ Ð¿Ð¾ÑÑ‚Ð°Ð²ÐµÐ½Ð° Ð²Ð¾ HTML Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð°"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° Ð±ÐµÑˆÐµ ÑÐ°Ð¼Ð¾ Ð´ÐµÐ»ÑƒÐ¼Ð½Ð¾ Ð¿Ð¾Ð´Ð¸Ð³Ð½Ð°Ñ‚Ð°."
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "ÐÐµ Ð±ÐµÑˆÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð½Ð°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ÐÐµ Ð¿Ð¾ÑÑ‚Ð¾Ð¸ Ð¿Ñ€Ð¸Ð²Ñ€ÐµÐ¼ÐµÐ½Ð° Ð¿Ð°Ð¿ÐºÐ°"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ÐÐµÑƒÑÐ¿ÐµÐ°Ð² Ð´Ð° Ð·Ð°Ð¿Ð¸ÑˆÐ°Ð¼ Ð½Ð° Ð´Ð¸ÑÐº"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -81,11 +81,11 @@ msgstr ""
 msgid "Files"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "ÐÐµ ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°Ñ˜"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 
@@ -93,137 +93,151 @@ msgstr "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
 msgid "Rename"
 msgstr "ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ˜"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²ÐµÑœÐµ Ð¿Ð¾ÑÑ‚Ð¾Ð¸"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸ Ð¸Ð¼Ðµ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð¶Ð¸"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "Ð·ÐµÐ¼ÐµÐ½ÐµÑ‚Ð° {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Ð²Ñ€Ð°Ñ‚Ð¸"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÑ‚Ð° {new_name} ÑÐ¾ {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "Ð±ÐµÐ· ÑÐ¿Ð¾Ð´ÐµÐ»ÑƒÐ²Ð°ÑšÐµ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐ°Ð½Ð¸ {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»Ð½Ð¾ Ð¸Ð¼Ðµ. , '\\', '/', '<', '>', ':', '\"', '|', '?' Ð¸ '*' Ð½Ðµ ÑÐµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Ð¡Ðµ Ð³ÐµÐ½ÐµÑ€Ð¸Ñ€Ð° ZIP Ñ„Ð°Ñ˜Ð»Ð¾Ñ‚, ÑœÐµ Ñ‚Ñ€ÐµÐ±Ð° Ð¸Ð·Ð²ÐµÑÐ½Ð¾ Ð²Ñ€ÐµÐ¼Ðµ."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¿Ñ€ÐµÐ·ÐµÐ¼Ðµ Ð²Ð°ÑˆÐ°Ñ‚Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ð±Ð¸Ð´ÐµÑ˜ÑœÐ¸ Ñ„Ð¾Ð»Ð´ÐµÑ€Ð¾Ñ‚ Ð²Ð¾ ÐºÐ¾Ñ˜ ÑÐµ Ð½Ð°Ð¾Ñ“Ð° Ñ„Ð°Ñ˜Ð»Ð¾Ñ‚ Ð¸Ð¼Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð° Ð¾Ð´ 0 Ð±Ð°Ñ˜Ñ‚Ð¸"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Ð—Ð°Ñ‚Ð²Ð¾Ð¸"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Ð§ÐµÐºÐ°"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° ÑÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð°"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ ÑÐµ Ð¿Ð¾Ð´Ð¸Ð³Ð°Ð°Ñ‚"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµÑ‚Ð¾ Ðµ Ð¿Ñ€ÐµÐºÐ¸Ð½Ð°Ñ‚Ð¾."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ÐŸÐ¾Ð´Ð¸Ð³Ð°ÑšÐµ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ðµ Ð²Ð¾ Ñ‚ÐµÐº. ÐÐ°Ð¿ÑƒÑˆÑ‚ÐµÑšÐµ Ð½Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°Ñ‚Ð° ÑœÐµ Ð³Ð¾ Ð¿Ñ€ÐµÐºÐ¸Ð½Ðµ."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "ÐÐ´Ñ€ÐµÑÐ°Ñ‚Ð° Ð½ÐµÐ¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ð¸Ð´Ðµ Ð¿Ñ€Ð°Ð·Ð½Ð°."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count}  Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ ÑÐºÐµÐ½Ð¸Ñ€Ð°Ð½Ð¸"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÑÐºÐµÐ½Ð¸Ñ€Ð°ÑšÐµ"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ð˜Ð¼Ðµ"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Ð“Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð°"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ÐŸÑ€Ð¾Ð¼ÐµÐ½ÐµÑ‚Ð¾"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} Ð¿Ð°Ð¿ÐºÐ¸"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ÐŸÐ¾Ð´Ð¸Ð³Ð½Ð¸"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Ð Ð°ÐºÑƒÐ²Ð°ÑšÐµ ÑÐ¾ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
@@ -272,36 +286,32 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "ÐžÐ´ Ð²Ñ€ÑÐºÐ°"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ÐŸÐ¾Ð´Ð¸Ð³Ð½Ð¸"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ÐžÑ‚ÐºÐ°Ð¶Ð¸ Ð¿Ñ€Ð¸ÐºÐ°Ñ‡ÑƒÐ²Ð°ÑšÐµ"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ð¢ÑƒÐºÐ° Ð½ÐµÐ¼Ð° Ð½Ð¸ÑˆÑ‚Ð¾. Ð¡Ð½Ð¸Ð¼ÐµÑ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð¸"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ñ‚Ð° Ðµ Ð¿Ñ€ÐµÐ¼Ð½Ð¾Ð³Ñƒ Ð³Ð¾Ð»ÐµÐ¼Ð°"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸Ñ‚Ðµ ÐºÐ¾Ð¸ ÑÐµ Ð¾Ð±Ð¸Ð´ÑƒÐ²Ð°Ñ‚Ðµ Ð´Ð° Ð³Ð¸ Ð¿Ð¾Ð´Ð¸Ð³Ð½ÐµÑ‚Ðµ Ñ˜Ð° Ð½Ð°Ð´Ð¼Ð¸Ð½ÑƒÐ²Ð°Ð°Ñ‚ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»Ð½Ð°Ñ‚Ð° Ð³Ð¾Ð»ÐµÐ¼Ð¸Ð½Ð° Ð·Ð° Ð¿Ð¾Ð´Ð¸Ð³Ð½ÑƒÐ²Ð°ÑšÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ Ð½Ð° Ð¾Ð²Ð¾Ñ˜ ÑÐµÑ€Ð²ÐµÑ€."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Ð¡Ðµ ÑÐºÐµÐ½Ð¸Ñ€Ð°Ð°Ñ‚ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸, Ð²Ðµ Ð¼Ð¾Ð»Ð°Ð¼ Ð¿Ð¾Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "ÐœÐ¾Ð¼ÐµÐ½Ñ‚Ð°Ð»Ð½Ð¾ ÑÐºÐµÐ½Ð¸Ñ€Ð°Ð¼"
diff --git a/l10n/mk/files_encryption.po b/l10n/mk/files_encryption.po
index 2b4f5dfb57af4d4ecdaeb033895f870b9f356a8d..b34192fc864b0a53b4e5210702367c91a666225f 100644
--- a/l10n/mk/files_encryption.po
+++ b/l10n/mk/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 13:14+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Ð•Ð½ÐºÑ€Ð¸Ð¿Ñ†Ð¸Ñ˜Ð°"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ð˜ÑÐºÐ»ÑƒÑ‡Ð¸ Ð³Ð¸ ÑÐ»ÐµÐ´Ð½Ð¸Ñ‚Ðµ Ñ‚Ð¸Ð¿Ð¾Ð²Ð¸ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸ Ð¾Ð´ ÐµÐ½ÐºÑ€Ð¸Ð¿Ñ†Ð¸Ñ˜Ð°"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "ÐÐ¸ÑˆÑ‚Ð¾"
-
-#: templates/settings.php:12
-msgid "Enable Encryption"
-msgstr "ÐžÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸ ÐµÐ½ÐºÑ€Ð¸Ð¿Ñ†Ð¸Ñ˜Ð°"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index bbe751713aa32cebd1e6c420957f46664d04b8a7..3f4e68131e372c0dca0c39cfaa54dd4935d9f4f9 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/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: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 13:19+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Ð˜ÑÑ‚ÐµÑ‡Ð¸ Ð³Ð¸ ÑÐ¸Ñ‚Ðµ Ð²ÐµÑ€Ð·Ð¸Ð¸"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ˜Ð°"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "ÐžÐ²Ð° ÑœÐµ Ð³Ð¸ Ð¸Ð·Ð±Ñ€Ð¸ÑˆÐµ ÑÐ¸Ñ‚Ðµ Ð¿Ð¾ÑÑ‚Ð¾ÐµÑ‡ÐºÐ¸ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¸ ÐºÐ¾Ð¿Ð¸Ð¸ Ð¾Ð´ Ð²Ð°ÑˆÐ¸Ñ‚Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Ð’ÐµÑ€Ð·Ð¸Ð¸ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index a315a725a966d6eca1619386c7bbcba140bf1dd2..ada37660729dba1fe825e22d5c03f6a40b29c1c6 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/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: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 13:04+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "ÐŸÐ¾Ð¼Ð¾Ñˆ"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "Ð›Ð¸Ñ‡Ð½Ð¾"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "ÐŸÐ°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¸"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "ÐÐ¿Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½"
 
-#: files.php:366
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð°ÑšÐµ Ð²Ð¾ ZIP Ðµ Ð¸ÑÐºÐ»ÑƒÑ‡ÐµÐ½Ð¾"
 
-#: files.php:367
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸Ñ‚Ðµ Ñ‚Ñ€ÐµÐ±Ð° Ð´Ð° ÑÐµ ÑÐ¸Ð¼Ð½Ð°Ñ‚ ÐµÐ´Ð½Ð° Ð¿Ð¾ ÐµÐ´Ð½Ð°."
 
-#: files.php:367 files.php:392
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ ÐºÐ¾Ð½ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ¸"
 
-#: files.php:391
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð²Ð¾ Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°"
 
@@ -82,55 +86,55 @@ msgstr "Ð¢ÐµÐºÑÑ‚"
 msgid "Images"
 msgstr "Ð¡Ð»Ð¸ÐºÐ¸"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Ð¿Ñ€ÐµÐ´ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€ÐµÐ´ 1 Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "Ð¿Ñ€ÐµÐ´ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð¸"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Ð¿Ñ€ÐµÐ´ 1 Ñ‡Ð°Ñ"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Ð¿Ñ€ÐµÐ´ %d Ñ‡Ð°ÑÐ¾Ð²Ð¸"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Ð´ÐµÐ½ÐµÑÐºÐ°"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "Ð¿Ñ€ÐµÐ´ %d Ð´ÐµÐ½Ð¾Ð²Ð¸"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð¸Ð¾Ñ‚ Ð¼ÐµÑÐµÑ†"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Ð¿Ñ€ÐµÐ´ %d Ð¼ÐµÑÐµÑ†Ð¸"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½Ð°Ñ‚Ð°Ñ‚Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ð¿Ñ€ÐµÐ´ Ð³Ð¾Ð´Ð¸Ð½Ð¸"
 
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 4a9325a5666b175b13e92fe79c75b592b566cf4a..8468db8e1a89a93bd8ddcc177c5b77ff97d3d595 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "ÐžÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð¸"
 msgid "Saving..."
 msgstr "Ð¡Ð½Ð¸Ð¼Ð°Ð¼..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -102,15 +102,15 @@ msgstr "Ð”Ð¾Ð´Ð°Ð´ÐµÑ‚Ðµ Ñ˜Ð° Ð’Ð°ÑˆÐ°Ñ‚Ð° Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°"
 msgid "More Apps"
 msgstr "ÐŸÐ¾Ð²ÐµÑœÐµ Ð°Ð¿Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Ð˜Ð·Ð±ÐµÑ€Ð¸ Ð°Ð¿Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð°"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Ð’Ð¸Ð´Ð¸ Ñ˜Ð° ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ð°Ñ‚Ð° ÑÐ¾ Ð°Ð¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ð¸ Ð½Ð° apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Ð»Ð¸Ñ†ÐµÐ½Ñ†Ð¸Ñ€Ð°Ð½Ð¾ Ð¾Ð´ <span class=\"author\"></span>"
 
@@ -159,7 +159,7 @@ msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð¸ ÐºÐ»Ð¸ÐµÐ½Ñ‚ Ð·Ð° ÐÐ½Ð´Ñ€Ð¾Ð¸Ð´"
 msgid "Download iOS Client"
 msgstr "ÐŸÑ€ÐµÐ·ÐµÐ¼Ð¸ iOS ÐºÐ»Ð¸ÐµÐ½Ñ‚"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
@@ -229,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ð˜Ð¼Ðµ"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¸"
 
@@ -245,26 +245,30 @@ msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ˜"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "ÐžÑÑ‚Ð°Ð½Ð°Ñ‚Ð¾"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð½Ð° Ð³Ñ€ÑƒÐ¿Ð°"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Ð˜Ð·Ð±Ñ€Ð¸ÑˆÐ¸"
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 3b3498bce1c37edac8c502b9c0efd1a063fcbbbe..c80a334455b7c518d8ad7be7e9578787b374a4fb 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/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: 2012-12-29 00:07+0100\n"
-"PO-Revision-Date: 2012-12-28 09:25+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr "ÐœÐ¾Ð¶Ðµ Ð´Ð° Ð³Ð¾ ÑÐºÐ¾ÐºÐ½ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ñ‚ÐºÐ¾Ð»Ð¾Ñ‚ Ð¾ÑÐ²ÐµÐ½ Ð°ÐºÐ¾
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -181,4 +193,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "ÐŸÐ¾Ð¼Ð¾Ñˆ"
diff --git a/l10n/mk/user_webdavauth.po b/l10n/mk/user_webdavauth.po
index 20fbb4d7b331421eccaae2b2da509a08929b5bd4..19b5d3df58ebf06cce6142f5704a6a1dbc9c7027 100644
--- a/l10n/mk/user_webdavauth.po
+++ b/l10n/mk/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-29 00:07+0100\n"
-"PO-Revision-Date: 2012-12-28 09:21+0000\n"
-"Last-Translator: Georgi Stanojevski <glisha@gmail.com>\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"
 "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,13 +18,17 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/ms_MY/core.po b/l10n/ms_MY/core.po
index fcd9385d0721888226f073adbf6d483f75d2688d..3a62b70434877e419ad91c5bcf6bbf613b8f1d78 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +82,135 @@ msgstr "tiada kategori dipilih untuk penghapusan"
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Ahad"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Isnin"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Selasa"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Rabu"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Khamis"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Jumaat"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Sabtu"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januari"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februari"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Mac"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mei"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Jun"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Julai"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Ogos"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Disember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -164,8 +240,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Ralat"
 
@@ -177,123 +253,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Kata laluan"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "Set semula kata lalaun ownCloud"
@@ -445,87 +539,11 @@ msgstr "Hos pangkalan data"
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Ahad"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Isnin"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Selasa"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Rabu"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Khamis"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Jumaat"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Sabtu"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januari"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februari"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Mac"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mei"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Jun"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Julai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Ogos"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Disember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Log keluar"
 
@@ -567,17 +585,3 @@ msgstr "seterus"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 5ae3ad9c1a65379b88754d9e619f75d448c101f6..642cde5a6e6a541e7528243368896758c6457327 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -35,46 +35,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Tiada fail dimuatnaik. Ralat tidak diketahui."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Tiada ralat, fail berjaya dimuat naik."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Fail yang dimuat naik melebihi MAX_FILE_SIZE yang dinyatakan dalam form HTML "
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Sebahagian daripada fail telah dimuat naik. "
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Tiada fail yang dimuat naik"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Folder sementara hilang"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Gagal untuk disimpan"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,11 +82,11 @@ msgstr ""
 msgid "Files"
 msgstr "fail"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Padam"
 
@@ -94,137 +94,151 @@ msgstr "Padam"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Muat naik ralat"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Tutup"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nama "
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Muat naik"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Pengendalian fail"
@@ -273,36 +287,32 @@ msgstr "Folder"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Muat naik"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Muat naik terlalu besar"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Imbasan semasa"
diff --git a/l10n/ms_MY/files_encryption.po b/l10n/ms_MY/files_encryption.po
index 33de1d365d7a4f8ffbf2324abcdd02ebc0a0482e..65777823e5bc5f66290921e512922605f620f889 100644
--- a/l10n/ms_MY/files_encryption.po
+++ b/l10n/ms_MY/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 46f3f7ed90ff7e60bc06c8baecfd625b6afa18d7..389afec231ee983acdb43ebc513da720d1830f1b 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index 57990c29b6bc0bacb38c7b7d34014f9eb391942c..5365e602ba13b63caa40ca4397d97f6c9b308cc7 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
-msgstr ""
+msgstr "Bantuan"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Peribadi"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Tetapan"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Pengguna"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Ralat pengesahan"
 
@@ -81,55 +85,55 @@ msgstr "Teks"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 72694ffcb9c7794ee945b413b5ee1e1c65d2353f..020c1d29f4a099046a440f0ded3c8c9808045a2c 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "Aktif"
 msgid "Saving..."
 msgstr "Simpan..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "_nama_bahasa_"
 
@@ -103,15 +103,15 @@ msgstr "Tambah apps anda"
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Pilih aplikasi"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman applikasi di apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Kata laluan "
 
@@ -230,11 +230,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nama"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Kumpulan"
 
@@ -246,26 +246,30 @@ msgstr "Buat"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Lain"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Padam"
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 4509f10da648511a520d38c433a02e4ff668772c..3c7e352259a088e95f63c21a8b1ec22689c3e081 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "Bantuan"
diff --git a/l10n/ms_MY/user_webdavauth.po b/l10n/ms_MY/user_webdavauth.po
index 2974263352cc2dde228c0aef50649312839b21ab..8e8f74d0a70447bcaee4504cc666b71106688ddc 100644
--- a/l10n/ms_MY/user_webdavauth.po
+++ b/l10n/ms_MY/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: ms_MY\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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 ae9bd903ac4b3797958af31ca2dc72a9ec010819..cf8ff804cf3d30f0683789b060cc3b6d8cd96dda 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -24,24 +24,24 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -86,59 +86,135 @@ msgstr "Ingen kategorier merket for sletting."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "SÃ¸ndag"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Mandag"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Tirsdag"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Fredag"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "LÃ¸rdag"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Mars"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Desember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} timer siden"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} dager siden"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "forrige mÃ¥ned"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} mÃ¥neder siden"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "mÃ¥neder siden"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "forrige Ã¥r"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ã¥r siden"
 
@@ -168,8 +244,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Feil"
 
@@ -181,123 +257,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Del med"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Del med link"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Send"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Set utlÃ¸psdato"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "UtlÃ¸psdato"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Del pÃ¥ epost"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "del"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utlÃ¸psdato"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Sender..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "E-post sendt"
 
+#: js/update.js:14
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Tilbakestill ownCloud passord"
@@ -449,87 +543,11 @@ msgstr "Databasevert"
 msgid "Finish setup"
 msgstr "FullfÃ¸r oppsetting"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "SÃ¸ndag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Mandag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Tirsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Fredag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "LÃ¸rdag"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Mars"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Desember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -571,17 +589,3 @@ msgstr "neste"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Sikkerhetsadvarsel!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifiser"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index d6d18d6614cd3ca9143df748577f96ca8d7c6300..035398726fdb55c20396aeb2364a5ff36217c60d 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -40,46 +40,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen filer ble lastet opp. Ukjent feil."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Det er ingen feil. Filen ble lastet opp."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "FilstÃ¸rrelsen overskrider maksgrensen pÃ¥ MAX_FILE_SIZE som ble oppgitt i HTML-skjemaet"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Filopplastningen ble bare delvis gjennomfÃ¸rt"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ingen fil ble lastet opp"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Mangler en midlertidig mappe"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Klarte ikke Ã¥ skrive til disk"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -87,11 +87,11 @@ msgstr ""
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Slett"
 
@@ -99,137 +99,151 @@ msgstr "Slett"
 msgid "Rename"
 msgstr "OmdÃ¸p"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} finnes allerede"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "foreslÃ¥ navn"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "erstatt {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "erstatt {new_name} med {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "slettet {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "opprettet ZIP-fil, dette kan ta litt tid"
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Opplasting feilet"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Lukk"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fil lastes opp"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} filer laster opp"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL-en kan ikke vÃ¦re tom."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} filer lest inn"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "feil under skanning"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "StÃ¸rrelse"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 mappe"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} mapper"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Last opp"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "FilhÃ¥ndtering"
@@ -278,36 +292,32 @@ msgstr "Mappe"
 msgid "From link"
 msgstr "Fra link"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Last opp"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Opplasting for stor"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Skanner etter filer, vennligst vent."
 
-#: templates/index.php:112
+#: templates/index.php:111
 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 a74d1bacc7e429c6d8f500eb4d74120fece89084..5e2f1a4cf99b09e16260fdd60260db466143fe92 100644
--- a/l10n/nb_NO/files_encryption.po
+++ b/l10n/nb_NO/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:13+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ekskluder fÃ¸lgende filer fra kryptering"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ingen"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "SlÃ¥ pÃ¥ kryptering"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index bd8d0fed59ef59c93426e575f811fa626e8c08b7..38f8fbe36fe8167a315a0738dd00c8f3a00b7f56 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.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-10-31 00:01+0100\n"
-"PO-Revision-Date: 2012-10-30 12:48+0000\n"
-"Last-Translator: hdalgrav <hdalgrav@gmail.com>\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"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historie"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versjoner"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dette vil slette alle tidligere versjoner av alle filene dine"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Fil versjonering"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index abaf9fc0847cb380e554b172acd1e2a58150f306..4de870048561ef4ce19b48e9dc01e99235c8b70f 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 17:26+0000\n"
-"Last-Translator: espenbye <espenbye@me.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,27 +22,27 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "Personlig"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Brukere"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "Apper"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
@@ -62,11 +62,15 @@ msgstr "Tilbake til filer"
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til Ã¥ kunne generere ZIP-fil"
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Applikasjon er ikke pÃ¥slÃ¥tt"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Autentiseringsfeil"
 
@@ -86,55 +90,55 @@ msgstr "Tekst"
 msgid "Images"
 msgstr "Bilder"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutter siden"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 time siden"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d timer siden"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "i dag"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d dager siden"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "forrige mÃ¥ned"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d mÃ¥neder siden"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "i fjor"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ã¥r siden"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 90871dc3820ba6607247ab5b75a3c1d0e341d253..15ea0f7eb689e7847ca100340d4ec5ba6f9c1885 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian BokmÃ¥l (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr "SlÃ¥ pÃ¥"
 msgid "Saving..."
 msgstr "Lagrer..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -107,15 +107,15 @@ msgstr "Legg til din App"
 msgid "More Apps"
 msgstr "Flere Apps"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Velg en app"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Se applikasjonens side pÃ¥ apps.owncloud.org"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -164,7 +164,7 @@ msgstr "Last ned Android-klient"
 msgid "Download iOS Client"
 msgstr "Last ned iOS-klient"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passord"
 
@@ -234,11 +234,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Navn"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupper"
 
@@ -250,26 +250,30 @@ msgstr "Opprett"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Annet"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Gruppeadministrator"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index b415afa31aad46bd9d2dfbcdaa0847785835ba1a..b7660396ac4e2b906bd1a13018863df7dd6486bf 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/nb_NO/user_webdavauth.po b/l10n/nb_NO/user_webdavauth.po
index 9d7d3571927f1400617d742c7c44479431796b73..915d27dae8f4790cb788b7d101362c8b7b429a8f 100644
--- a/l10n/nb_NO/user_webdavauth.po
+++ b/l10n/nb_NO/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-30 00:04+0100\n"
-"PO-Revision-Date: 2012-12-29 16:42+0000\n"
-"Last-Translator: espenbye <espenbye@me.com>\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"
 "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,13 +18,17 @@ msgstr ""
 "Language: nb_NO\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 "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index e22773d2369947d1c50411bdc99c79a6338f435b..e331b66a8d78cd5ffa26d6346846ed75877ed3a2 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -31,24 +31,24 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Gebruiker %s deelde een bestand met u"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Gebruiker %s deelde een map met u"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "Gebruiker %s deelde bestand \"%s\" met u. Het is hier te downloaden: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -93,59 +93,135 @@ msgstr "Geen categorie geselecteerd voor verwijdering."
 msgid "Error removing %s from favorites."
 msgstr "Verwijderen %s van favorieten is mislukt."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Zondag"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Maandag"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Dinsdag"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Woensdag"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Donderdag"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Vrijdag"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Zaterdag"
+
+#: js/config.php:33
+msgid "January"
+msgstr "januari"
+
+#: js/config.php:33
+msgid "February"
+msgstr "februari"
+
+#: js/config.php:33
+msgid "March"
+msgstr "maart"
+
+#: js/config.php:33
+msgid "April"
+msgstr "april"
+
+#: js/config.php:33
+msgid "May"
+msgstr "mei"
+
+#: js/config.php:33
+msgid "June"
+msgstr "juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "augustus"
+
+#: js/config.php:33
+msgid "September"
+msgstr "september"
+
+#: js/config.php:33
+msgid "October"
+msgstr "oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "november"
+
+#: js/config.php:33
+msgid "December"
+msgstr "december"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minuut geleden"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuten geleden"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 uur geleden"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} uren geleden"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "vandaag"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "gisteren"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} dagen geleden"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "vorige maand"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} maanden geleden"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "maanden geleden"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "vorig jaar"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "jaar geleden"
 
@@ -175,8 +251,8 @@ msgid "The object type is not specified."
 msgstr "Het object type is niet gespecificeerd."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Fout"
 
@@ -188,123 +264,141 @@ msgstr "De app naam is niet gespecificeerd."
 msgid "The required file {file} is not installed!"
 msgstr "Het vereiste bestand {file} is niet geÃ¯nstalleerd!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Fout tijdens het stoppen met delen"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Fout tijdens het veranderen van permissies"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Gedeeld met u en de groep {group} door {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Gedeeld met u door {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Deel met"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Deel met link"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Wachtwoord beveiliging"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "E-mail link naar persoon"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Versturen"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Stel vervaldatum in"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Deel via email:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Geen mensen gevonden"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Gedeeld in {item} met {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "kan wijzigen"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "toegangscontrole"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "maak"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "bijwerken"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "verwijderen"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Versturen ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "E-mail verzonden"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud wachtwoord herstellen"
@@ -456,87 +550,11 @@ msgstr "Database server"
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Zondag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Maandag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Dinsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Woensdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Donderdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Vrijdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Zaterdag"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "januari"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "februari"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "maart"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "april"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "mei"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "augustus"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "september"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "november"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "december"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Afmelden"
 
@@ -578,17 +596,3 @@ msgstr "volgende"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Updaten ownCloud naar versie %s, dit kan even duren."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Beveiligingswaarschuwing!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Verifieer uw wachtwoord!<br/>Om veiligheidsredenen wordt u regelmatig gevraagd uw wachtwoord in te geven."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifieer"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 9471312dac3c8025ae4c3bae133647465b920a36..0fcff7925a674e0cfc0dc556a50f40fbead69972 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -14,12 +14,13 @@
 #   <lenny@weijl.org>, 2012.
 #   <pietje8501@gmail.com>, 2012.
 # Richard Bos <radoeka@gmail.com>, 2012.
+# Wilfred Dijksman <info@wdijksman.nl>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -31,57 +32,57 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Kon %s niet verplaatsen"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Kan bestand niet hernoemen"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Er was geen bestand geladen.  Onbekende fout"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Geen fout opgetreden, bestand successvol geupload."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Het geÃ¼ploade bestand overscheidt de upload_max_filesize optie in php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Het geÃ¼ploade bestand is groter dan de MAX_FILE_SIZE richtlijn die is opgegeven in de HTML-formulier"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Het bestand is slechts gedeeltelijk geupload"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Geen bestand geÃ¼pload"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Een tijdelijke map mist"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Schrijven naar schijf mislukt"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Niet genoeg ruimte beschikbaar"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Ongeldige directory."
 
@@ -89,11 +90,11 @@ msgstr "Ongeldige directory."
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Stop delen"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -101,137 +102,151 @@ msgstr "Verwijder"
 msgid "Rename"
 msgstr "Hernoem"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} bestaat al"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Stel een naam voor"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "verving {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "verving {new_name} met {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "delen gestopt {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "verwijderde {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' is een ongeldige bestandsnaam."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Bestandsnaam kan niet leeg zijn."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "aanmaken ZIP-file, dit kan enige tijd duren."
+#: 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:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Upload Fout"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Sluit"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Wachten"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 bestand wordt ge-upload"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: 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:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL kan niet leeg zijn."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Ongeldige mapnaam. Gebruik van'Gedeeld' is voorbehouden aan Owncloud"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} bestanden gescanned"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Fout tijdens het scannen"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Naam"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Laatst aangepast"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 map"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} mappen"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 bestand"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} bestanden"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Upload"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Bestand"
@@ -280,36 +295,32 @@ msgstr "Map"
 msgid "From link"
 msgstr "Vanaf link"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Upload"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Bestanden te groot"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Er wordt gescand"
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index bd80bdcae78015dc4f97b814722700ab60ad1ca9..b1ef07dc13ea4d7bd94600c05955e945775ff6d4 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 19:11+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Versleuteling"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Versleutel de volgende bestand types niet"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Geen"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Zet versleuteling aan"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 0328e198c572bbcfb679767d0cb607dab3308805..95169bacce0f20595fc67649f6f92a9d1a797392 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/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: 2012-10-28 00:01+0200\n"
-"PO-Revision-Date: 2012-10-27 08:43+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Alle versies laten verlopen"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Geschiedenis"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versies"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Dit zal alle bestaande backup versies van uw bestanden verwijderen"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Bestand versies"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index f8ebea3c492ef47cbc23d737e3c9990a44753922..2ae038b9e406daf42b280db369bce47f52794cce 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AndrÃ© Koot <meneer@tken.net>, 2013.
 #   <lenny@weijl.org>, 2012.
 # Richard Bos <radoeka@gmail.com>, 2012.
 #   <transifex@thisnet.nl>, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 05:45+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2013-01-19 00:04+0100\n"
+"PO-Revision-Date: 2013-01-18 09:03+0000\n"
+"Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +21,55 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Help"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Instellingen"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Gebruikers"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Beheerder"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten Ã©Ã©n voor Ã©Ã©n worden gedownload."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "kon niet worden vastgesteld"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "De applicatie is niet actief"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Authenticatie fout"
 
@@ -84,55 +89,55 @@ msgstr "Tekst"
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "seconden geleden"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minuut geleden"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuten geleden"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 uur geleden"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d uren geleden"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "vandaag"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "gisteren"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d dagen geleden"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "vorige maand"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d maanden geleden"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "vorig jaar"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "jaar geleden"
 
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 792081672ed039323a78adf10c19a743407b6327..d3d08ece029e37dcc450f4d06e3ff6614145c8a3 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -98,7 +98,7 @@ msgstr "Inschakelen"
 msgid "Saving..."
 msgstr "Aan het bewaren....."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Nederlands"
 
@@ -110,15 +110,15 @@ msgstr "App toevoegen"
 msgid "More Apps"
 msgstr "Meer apps"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selecteer een app"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>"
 
@@ -167,7 +167,7 @@ msgstr "Download Android Client"
 msgid "Download iOS Client"
 msgstr "Download iOS Client"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -237,11 +237,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Naam"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Groepen"
 
@@ -253,26 +253,30 @@ msgstr "CreÃ«er"
 msgid "Default Storage"
 msgstr "Default opslag"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ongelimiteerd"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Andere"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Groep beheerder"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Opslag"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Default"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "verwijderen"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 840adfacc66f0adbccdcb71c9b259cf695983a75..41b46e70ec4e38cc4cf5c73310be0df3db9c1f55 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.po
@@ -3,14 +3,15 @@
 # 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.
+#  <bart.formosus@gmail.com>, 2013.
 #   <lenny@weijl.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 17:25+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 15:38+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"
@@ -28,9 +29,9 @@ msgstr "<b>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompati
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geÃ¯nstalleerd, de backend zal dus niet werken. Vraag uw beheerder de module te installeren."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Waarschuwing:</b> De PHP LDAP module is niet geÃ¯nstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -43,15 +44,19 @@ msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval
 
 #: templates/settings.php:16
 msgid "Base DN"
-msgstr "Basis DN"
+msgstr "Base DN"
+
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Een Base DN per regel"
 
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
+msgstr "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
 
 #: templates/settings.php:17
 msgid "User DN"
-msgstr "Gebruikers DN"
+msgstr "User DN"
 
 #: templates/settings.php:17
 msgid ""
@@ -116,10 +121,18 @@ msgstr "Poort"
 msgid "Base User Tree"
 msgstr "Basis Gebruikers Structuur"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Een User Base DN per regel"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Basis Groupen Structuur"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Een Group Base DN per regel"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Groepslid associatie"
diff --git a/l10n/nl/user_webdavauth.po b/l10n/nl/user_webdavauth.po
index 81dd911eef56007abb511e794fef270336bf64e8..8606d6f3164523219f6ead10df2cff1de19e4bd4 100644
--- a/l10n/nl/user_webdavauth.po
+++ b/l10n/nl/user_webdavauth.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:10+0100\n"
-"PO-Revision-Date: 2012-12-20 17:23+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 09:56+0000\n"
 "Last-Translator: AndrÃ© Koot <meneer@tken.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV authenticatie"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud zal de inloggegevens naar deze URL als geÃ¯nterpreteerde http 401 en http 403 als de inloggegevens onjuist zijn. Andere codes als de inloggegevens correct zijn."
+"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 stuurt de inloggegevens naar deze URL. Deze plugin controleert het antwoord en interpreteert de HTTP statuscodes 401 als 403 als ongeldige inloggegevens, maar alle andere antwoorden als geldige inloggegevens."
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 1856fc19f752e4669053ee43bbc34976c7c57cce..f50e25d9507814806c6891dcec5c0001fecd67dc 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,59 +81,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "SÃ¸ndag"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "MÃ¥ndag"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Tysdag"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Fredag"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Laurdag"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Mars"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Desember"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -163,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Feil"
 
@@ -176,123 +252,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Passord"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -444,87 +538,11 @@ msgstr "Databasetenar"
 msgid "Finish setup"
 msgstr "FullfÃ¸r oppsettet"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "SÃ¸ndag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "MÃ¥ndag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Tysdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Fredag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Laurdag"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Mars"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Desember"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Logg ut"
 
@@ -566,17 +584,3 @@ msgstr "neste"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 28e98a9cd5752721c2fb7d07b876d665d3638cac..3cd6f2dfa04f8e4477b33f249da0c659224797d4 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Ingen feil, fila vart lasta opp"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den opplasta fila er stÃ¸rre enn variabelen MAX_FILE_SIZE i HTML-skjemaet"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Fila vart berre delvis lasta opp"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ingen filer vart lasta opp"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Manglar ei mellombels mappe"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Slett"
 
@@ -92,137 +92,151 @@ msgstr "Slett"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Lukk"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Last opp"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -271,36 +285,32 @@ msgstr "Mappe"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Last opp"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/nn_NO/files_encryption.po b/l10n/nn_NO/files_encryption.po
index 8ad39e5cbfb64a1526c13f0357dbb8ca986d4da3..f821638fbcdc3db9427bb1e76b8744192d46192d 100644
--- a/l10n/nn_NO/files_encryption.po
+++ b/l10n/nn_NO/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 4e0539875ac00a2237d0a6a270db9bee36cdf309..3d20ded946a69df6026534e9d5c2aa9a1d458051 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index ee2fd61fe0257ca5913edfdb266023843da083a1..5d33fc1e808ab605434a43ee61fac7b370699980 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+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,51 +17,55 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Hjelp"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personleg"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Brukarar"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Feil i autentisering"
 
@@ -81,55 +85,55 @@ msgstr "Tekst"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 3eb12c318ad767c571dc0009eedfdd256de5e0a7..cb70f810e6b8659dca7f55ed5c17feec4071271f 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "SlÃ¥ pÃ¥"
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Nynorsk"
 
@@ -101,15 +101,15 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vel ein applikasjon"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -158,7 +158,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Passord"
 
@@ -228,11 +228,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Namn"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupper"
 
@@ -244,26 +244,30 @@ msgstr "Lag"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Anna"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Slett"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 7f064cb1e257f04532741334cea269538e6fcee8..0046c6c622c34c3521295687f6d047de82ff46a5 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+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"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "Hjelp"
diff --git a/l10n/nn_NO/user_webdavauth.po b/l10n/nn_NO/user_webdavauth.po
index 0c942635476cb6d905ff1a3f7c6f1c8c4795055e..42c4c7ed9766f0a5759f6a912c130e0ec63e5b47 100644
--- a/l10n/nn_NO/user_webdavauth.po
+++ b/l10n/nn_NO/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: nn_NO\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/oc/core.po b/l10n/oc/core.po
index c2aede203e56f31d663929eed2041c8ec6cad2c2..11903a2bbcf9c3a8919154f60f48cdf1294ee6ef 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr "Pas de categorias seleccionadas per escafar."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Dimenge"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Diluns"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "DimarÃ§"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Dimecres"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "DijÃ²us"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Divendres"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Dissabte"
+
+#: js/config.php:33
+msgid "January"
+msgstr "GeniÃ¨r"
+
+#: js/config.php:33
+msgid "February"
+msgstr "FebriÃ¨r"
+
+#: js/config.php:33
+msgid "March"
+msgstr "MarÃ§"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Abril"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Junh"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Julhet"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Agost"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Septembre"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Octobre"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembre"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Decembre"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "uÃ¨i"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "iÃ¨r"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "ans a"
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Error"
 
@@ -175,123 +251,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Error al non partejar"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Error al cambiar permissions"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Parteja amb"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Parteja amb lo ligam"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Parat per senhal"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Senhal"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Met la data d'expiracion"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Data d'expiracion"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Parteja tras corriÃ¨l :"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Deguns trobat"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Non parteje"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "pÃ²t modificar"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ContrarÃ²tle d'acces"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "met a jorn"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "escafa"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "senhal d'ownCloud tornat botar"
@@ -443,87 +537,11 @@ msgstr "Ã’ste de basa de donadas"
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Dimenge"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Diluns"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "DimarÃ§"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Dimecres"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "DijÃ²us"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Divendres"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Dissabte"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "GeniÃ¨r"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "FebriÃ¨r"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "MarÃ§"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Abril"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Junh"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Julhet"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Agost"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Septembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Octobre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Novembre"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Decembre"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Services web jos ton contrarÃ²tle"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Sortida"
 
@@ -565,17 +583,3 @@ msgstr "venent"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 63681ee8348df46a23678f1edfd915ee3cae018d..7d952dff63ccebff7de0d896a6718ff0ae11372a 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -32,46 +32,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Amontcargament capitat, pas d'errors"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "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:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Lo fichiÃ¨r foguÃ¨t pas completament amontcargat"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Cap de fichiÃ¨rs son estats amontcargats"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Un dorsiÃ¨r temporari manca"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "L'escriptura sul disc a fracassat"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -79,11 +79,11 @@ msgstr ""
 msgid "Files"
 msgstr "FichiÃ¨rs"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Non parteja"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Escafa"
 
@@ -91,137 +91,151 @@ msgstr "Escafa"
 msgid "Rename"
 msgstr "Torna nomenar"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "remplaÃ§a"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "nom prepausat"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "anulla"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "defar"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "FichiÃ¨r ZIP a se far, aquÃ² pÃ²t trigar un briu."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Error d'amontcargar"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Al esperar"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 fichiÃ¨r al amontcargar"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Amontcargar anullat."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "error pendant l'exploracion"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nom"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Talha"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Amontcarga"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Manejament de fichiÃ¨r"
@@ -270,36 +284,32 @@ msgstr "DorsiÃ¨r"
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Amontcarga"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr " Anulla l'amontcargar"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Pas res dedins. Amontcarga qualquaren"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Avalcarga"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Amontcargament trÃ²p grÃ²s"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Los fiichiÃ¨rs son a Ã¨sser explorats, "
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Exploracion en cors"
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
index d6e0c7a83be79ee161858db6b83e28b62c9b6057..91f6f906aae1081f923cf9648ea10103c7360652 100644
--- a/l10n/oc/files_encryption.po
+++ b/l10n/oc/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,18 +17,66 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
index 8ea27eb32434c744915349e2e6aa56df61178ca2..e8848887184a9f8bd37eab27ccbe67538ab2d3db 100644
--- a/l10n/oc/files_versions.po
+++ b/l10n/oc/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
index 150704cd23513bbdeb7154ee433e123c4d81e2e3..7a056315f6d6c9a494d9f9b2ecfe17a3f46d2e2f 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Configuracion"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "UsanciÃ¨rs"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Apps"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Avalcargar los ZIP es inactiu."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Los fichiÃ¨rs devan Ã¨sser avalcargats un per un."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Torna cap als fichiÃ¨rs"
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Error d'autentificacion"
 
@@ -82,55 +86,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutas a"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "uÃ¨i"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "iÃ¨r"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d jorns a"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "mes passat"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "an passat"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "ans a"
 
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index df76be9ca674b9585e7e441a5fe7f441d298e28c..624ac3293f6881695a56f1132399543e2284a8e9 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "Activa"
 msgid "Saving..."
 msgstr "Enregistra..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -100,15 +100,15 @@ msgstr "Ajusta ton App"
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selecciona una applicacion"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Agacha la pagina d'applications en cÃ² de apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenÃ§iat per <span class=\"author\"></span>"
 
@@ -157,7 +157,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Senhal"
 
@@ -227,11 +227,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nom"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grops"
 
@@ -243,26 +243,30 @@ msgstr "Crea"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Autres"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grop Admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Escafa"
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index 29bd7864d7ef3239bc1817ab2a4f84662af40164..f3e7f309794de10069352f43cb463ea2dd41272a 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
diff --git a/l10n/oc/user_webdavauth.po b/l10n/oc/user_webdavauth.po
index 5d411e9dab1098472db3fae353b20a8548c385da..03cdef79eb0ee5eae569799ab2b6b0f0dbdbe07a 100644
--- a/l10n/oc/user_webdavauth.po
+++ b/l10n/oc/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: oc\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/pl/core.po b/l10n/pl/core.po
index 4bcaa717c39dd33be6256ab3d8a54e676b8bc43b..ba00a2aa5f54bf5812604f5421f43744c0051836 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -27,24 +27,24 @@ 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:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "UÅ¼ytkownik %s wspÃ³Å‚dzieli plik z tobÄ…"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Uzytkownik %s wspÃ³ldzieli folder z toba"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -89,59 +89,135 @@ msgstr "Nie ma kategorii zaznaczonych do usuniÄ™cia."
 msgid "Error removing %s from favorites."
 msgstr "BÅ‚Ä…d usuniÄ™cia %s z ulubionych."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Niedziela"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "PoniedziaÅ‚ek"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Wtorek"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Åšroda"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Czwartek"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "PiÄ…tek"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Sobota"
+
+#: js/config.php:33
+msgid "January"
+msgstr "StyczeÅ„"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Luty"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Marzec"
+
+#: js/config.php:33
+msgid "April"
+msgstr "KwiecieÅ„"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maj"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Czerwiec"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Lipiec"
+
+#: js/config.php:33
+msgid "August"
+msgstr "SierpieÅ„"
+
+#: js/config.php:33
+msgid "September"
+msgstr "WrzesieÅ„"
+
+#: js/config.php:33
+msgid "October"
+msgstr "PaÅºdziernik"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Listopad"
+
+#: js/config.php:33
+msgid "December"
+msgstr "GrudzieÅ„"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minute temu"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minut temu"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 godzine temu"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} godzin temu"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "dziÅ›"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} dni temu"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "ostani miesiÄ…c"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} miesiÄ™cy temu"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "miesiÄ™cy temu"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "ostatni rok"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "lat temu"
 
@@ -171,8 +247,8 @@ msgid "The object type is not specified."
 msgstr "Typ obiektu nie jest okreÅ›lony."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "BÅ‚Ä…d"
 
@@ -184,123 +260,141 @@ msgstr "Nazwa aplikacji nie jest okreÅ›lona."
 msgid "The required file {file} is not installed!"
 msgstr "Å»Ä…dany plik {file} nie jest zainstalowany!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "BÅ‚Ä…d podczas wspÃ³Å‚dzielenia"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "BÅ‚Ä…d podczas zatrzymywania wspÃ³Å‚dzielenia"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "BÅ‚Ä…d przy zmianie uprawnieÅ„"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "UdostÄ™pnione Tobie i grupie {group} przez {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "UdostÄ™pnione Ci przez {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "WspÃ³Å‚dziel z"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "WspÃ³Å‚dziel z link"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Zabezpieczone hasÅ‚em"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "HasÅ‚o"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Email do osoby"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "WyÅ›lij"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Ustaw datÄ™ wygaÅ›niÄ™cia"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Data wygaÅ›niÄ™cia"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "WspÃ³Å‚dziel poprzez maila"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Nie znaleziono ludzi"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "WspÃ³Å‚dzielenie nie jest moÅ¼liwe"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "WspÃ³Å‚dzielone w {item} z {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Zatrzymaj wspÃ³Å‚dzielenie"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "moÅ¼na edytowaÄ‡"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "kontrola dostÄ™pu"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "utwÃ³rz"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "uaktualnij"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "usuÅ„"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "wspÃ³Å‚dziel"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Zabezpieczone hasÅ‚em"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "BÅ‚Ä…d niszczenie daty wygaÅ›niÄ™cia"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "BÅ‚Ä…d podczas ustawiania daty wygaÅ›niÄ™cia"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "WysyÅ‚anie..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "WyÅ›lij Email"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "restart hasÅ‚a"
@@ -452,87 +546,11 @@ msgstr "Komputer bazy danych"
 msgid "Finish setup"
 msgstr "ZakoÅ„cz konfigurowanie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Niedziela"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "PoniedziaÅ‚ek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Wtorek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Åšroda"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Czwartek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "PiÄ…tek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Sobota"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "StyczeÅ„"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Luty"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Marzec"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "KwiecieÅ„"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Czerwiec"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Lipiec"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "SierpieÅ„"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "WrzesieÅ„"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "PaÅºdziernik"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Listopad"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "GrudzieÅ„"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "usÅ‚ugi internetowe pod kontrolÄ…"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Wylogowuje uÅ¼ytkownika"
 
@@ -574,17 +592,3 @@ msgstr "naprzÃ³d"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Aktualizowanie ownCloud do wersji %s, moÅ¼e to potrwaÄ‡ chwilÄ™."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "OstrzeÅ¼enie o zabezpieczeniach!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "SprawdÅº swoje hasÅ‚o.<br/>Ze wzglÄ™dÃ³w bezpieczeÅ„stwa moÅ¼esz zostaÄ‡ czasami poproszony o wprowadzenie hasÅ‚a ponownie."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Zweryfikowane"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 64357ad8259c1cad9f2e1a8e4fc1a11a4d7665ca..273a818baff78e22cfa2339374422f482a0862c3 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bbartlomiej@gmail.com>, 2013.
 # Cyryl Sochacki <>, 2012.
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
 # Marcin MaÅ‚ecki <gerber@tkdami.net>, 2011-2012.
@@ -14,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -27,57 +28,57 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Nie moÅ¼na byÅ‚o przenieÅ›Ä‡ %s - Plik o takiej nazwie juÅ¼ istnieje"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Nie moÅ¼na byÅ‚o przenieÅ›Ä‡ %s"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Nie moÅ¼na zmieniÄ‡ nazwy pliku"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Plik nie zostaÅ‚ zaÅ‚adowany. Nieznany bÅ‚Ä…d"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "PrzesÅ‚ano plik"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Wgrany plik przekracza wartoÅ›Ä‡ upload_max_filesize zdefiniowanÄ… w php.ini: "
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 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"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Plik przesÅ‚ano tylko czÄ™Å›ciowo"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Nie przesÅ‚ano Å¼adnego pliku"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Brak katalogu tymczasowego"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "BÅ‚Ä…d zapisu na dysk"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Za maÅ‚o miejsca"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "ZÅ‚a Å›cieÅ¼ka."
 
@@ -85,11 +86,11 @@ msgstr "ZÅ‚a Å›cieÅ¼ka."
 msgid "Files"
 msgstr "Pliki"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Nie udostÄ™pniaj"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Usuwa element"
 
@@ -97,137 +98,151 @@ msgstr "Usuwa element"
 msgid "Rename"
 msgstr "ZmieÅ„ nazwÄ™"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} juÅ¼ istnieje"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "zastap"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "zasugeruj nazwÄ™"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "zastÄ…piony {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "wrÃ³Ä‡"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "zastÄ…piony {new_name} z {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "UdostÄ™pniane wstrzymane {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "usuniÄ™to {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.'  jest nieprawidÅ‚owÄ… nazwÄ… pliku."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Nazwa pliku nie moÅ¼e byÄ‡ pusta."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Niepoprawna nazwa, Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*'sÄ… niedozwolone."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Generowanie pliku ZIP, moÅ¼e potrwaÄ‡ pewien czas."
+#: 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:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 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"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "BÅ‚Ä…d wczytywania"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Zamknij"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "OczekujÄ…ce"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 plik wczytany"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} przesyÅ‚anie plikÃ³w"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:464
+#: js/files.js:493
 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."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL nie moÅ¼e byÄ‡ pusty."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "Nazwa folderu nieprawidÅ‚owa. Wykorzystanie \"Shared\" jest zarezerwowane przez Owncloud"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} pliki skanowane"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "WystÄ…piÅ‚ bÅ‚Ä…d podczas skanowania"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nazwa"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} foldery"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 plik"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} pliki"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "PrzeÅ›lij"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "ZarzÄ…dzanie plikami"
@@ -276,36 +291,32 @@ msgstr "Katalog"
 msgid "From link"
 msgstr "Z linku"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "PrzeÅ›lij"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "PrzestaÅ„ wysyÅ‚aÄ‡"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Brak zawartoÅ›ci. ProszÄ™ wysÅ‚aÄ‡ pliki!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Pobiera element"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "WysyÅ‚any plik ma za duÅ¼y rozmiar"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Pliki ktÃ³re prÃ³bujesz przesÅ‚aÄ‡, przekraczajÄ… maksymalnÄ…, dopuszczalnÄ… wielkoÅ›Ä‡."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plikÃ³w, proszÄ™ czekaÄ‡."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
diff --git a/l10n/pl/files_encryption.po b/l10n/pl/files_encryption.po
index fbb12dbe1fb79e74feaac82c55aa9f0190627338..21fa364ff19763857af0aeb707bc679f93406cac 100644
--- a/l10n/pl/files_encryption.po
+++ b/l10n/pl/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 12:15+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "WyÅ‚Ä…cz nastÄ™pujÄ…ce typy plikÃ³w z szyfrowania"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Brak"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "WÅ‚Ä…cz szyfrowanie"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index adfdc97439a6b09a6990bd9203509e000a9ef918..a2020d78f2dbc930d608f0d6987acddbb87a5ead 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.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-09-26 13:19+0200\n"
-"PO-Revision-Date: 2012-09-26 10:42+0000\n"
-"Last-Translator: emc <mplichta@gmail.com>\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"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "WygasajÄ… wszystkie wersje"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historia"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Wersje"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Spowoduje to usuniÄ™cie wszystkich istniejÄ…cych wersji kopii zapasowych plikÃ³w"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Wersjonowanie plikÃ³w"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 0cebd731831151bfba1e27fa497fb371d3fa9c77..917ce3b654bdfdac25939cf9ba2aa379ff891768 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -5,14 +5,14 @@
 # Translators:
 # Cyryl Sochacki <>, 2012.
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
-# Marcin MaÅ‚ecki <gerber@tkdami.net>, 2012.
+# 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: 2012-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 08:54+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2013-01-29 00:05+0100\n"
+"PO-Revision-Date: 2013-01-28 19:59+0000\n"
+"Last-Translator: Marcin MaÅ‚ecki <gerber@tkdami.net>\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,51 +20,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Osobiste"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "UÅ¼ytkownicy"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Aplikacje"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Pobieranie ZIP jest wyÅ‚Ä…czone."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Pliki muszÄ… zostaÄ‡ pobrane pojedynczo."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "WrÃ³Ä‡ do plikÃ³w"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Wybrane pliki sÄ… zbyt duÅ¼e, aby wygenerowaÄ‡ plik zip."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "nie moÅ¼e zostaÄ‡ znaleziony"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Aplikacja nie jest wÅ‚Ä…czona"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "BÅ‚Ä…d uwierzytelniania"
 
@@ -84,55 +88,55 @@ msgstr "PoÅ‚Ä…czenie tekstowe"
 msgid "Images"
 msgstr "Obrazy"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minutÄ™ temu"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minut temu"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 godzine temu"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d godzin temu"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "dzisiaj"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d dni temu"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "ostatni miesiÄ…c"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d miesiecy temu"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "ostatni rok"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "lat temu"
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 8482ae800e68fecc123d4d0710b173d246bca7f1..3bca8654b80ba18f66801146b6e9a0419f89e9cf 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <b13n1u@gmail.com>, 2013.
 # Cyryl Sochacki <>, 2012.
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012-2013.
 #   <icewind1991@gmail.com>, 2012.
@@ -17,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -97,7 +98,7 @@ msgstr "WÅ‚Ä…cz"
 msgid "Saving..."
 msgstr "Zapisywanie..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Polski"
 
@@ -109,15 +110,15 @@ msgstr "Dodaj aplikacje"
 msgid "More Apps"
 msgstr "WiÄ™cej aplikacji"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Zaznacz aplikacje"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Zobacz stronÄ™ aplikacji na apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>"
 
@@ -166,7 +167,7 @@ msgstr "Pobierz klienta dla Androida"
 msgid "Download iOS Client"
 msgstr "Pobierz klienta dla iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "HasÅ‚o"
 
@@ -234,13 +235,13 @@ 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 "Stwirzone 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>, 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>."
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nazwa"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupy"
 
@@ -252,26 +253,30 @@ msgstr "UtwÃ³rz"
 msgid "Default Storage"
 msgstr "DomyÅ›lny magazyn"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Bez limitu"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Inne"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupa Admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Magazyn"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "DomyÅ›lny"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "UsunÌ"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 25b35d770df89bf1aa07b83988722dd8e974d78d..cd8904acc25fe454ab89e9b2532f76ec5e2ae398 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/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: 2012-12-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 18:12+0000\n"
-"Last-Translator: Marcin MaÅ‚ecki <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,9 +29,9 @@ msgstr "<b>OstrzeÅ¼enie:</b> Aplikacje user_ldap i user_webdavauth nie sÄ…  komp
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>OstrzeÅ¼enie:</b>  ModuÅ‚ PHP LDAP nie jest zainstalowany i nie bÄ™dzie dziaÅ‚aÅ‚. PoproÅ› administratora o wÅ‚Ä…czenie go."
+"<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 "Host"
@@ -46,6 +46,10 @@ msgstr "MoÅ¼na pominÄ…Ä‡ protokÃ³Å‚, z wyjÄ…tkiem wymaganego protokoÅ‚u SSL. Nas
 msgid "Base DN"
 msgstr "Baza DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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"
@@ -117,10 +121,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "Drzewo bazy uÅ¼ytkownikÃ³w"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Drzewo bazy grup"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "CzÅ‚onek grupy stowarzyszenia"
diff --git a/l10n/pl/user_webdavauth.po b/l10n/pl/user_webdavauth.po
index f745f1f1320007946d5171939fa5891363ea3d20..44e963a5a43418d911619eb251586c76198e1753 100644
--- a/l10n/pl/user_webdavauth.po
+++ b/l10n/pl/user_webdavauth.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bbartlomiej@gmail.com>, 2013.
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
 # Marcin MaÅ‚ecki <gerber@tkdami.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 11:39+0000\n"
-"Last-Translator: Marcin MaÅ‚ecki <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 08:54+0000\n"
+"Last-Translator: bbartlomiej <bbartlomiej@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,17 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Uwierzytelnienie WebDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud wyÅ›le dane uwierzytelniajÄ…ce do tego URL. Ten plugin sprawdza odpowiedÅº i zinterpretuje kody HTTP 401 oraz 403 jako nieprawidÅ‚owe dane uwierzytelniajÄ…ce, a kaÅ¼dy inny kod odpowiedzi jako poprawne dane."
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 76a51798833a0d0bc38b76c155c5361221c200f1..7f8272bc0845bb0a0181655b32ae3064ffe1143b 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,24 +17,24 @@ 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/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -79,59 +79,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:33
+msgid "January"
+msgstr ""
+
+#: js/config.php:33
+msgid "February"
+msgstr ""
+
+#: js/config.php:33
+msgid "March"
+msgstr ""
+
+#: js/config.php:33
+msgid "April"
+msgstr ""
+
+#: js/config.php:33
+msgid "May"
+msgstr ""
+
+#: js/config.php:33
+msgid "June"
+msgstr ""
+
+#: js/config.php:33
+msgid "July"
+msgstr ""
+
+#: js/config.php:33
+msgid "August"
+msgstr ""
+
+#: js/config.php:33
+msgid "September"
+msgstr ""
+
+#: js/config.php:33
+msgid "October"
+msgstr ""
+
+#: js/config.php:33
+msgid "November"
+msgstr ""
+
+#: js/config.php:33
+msgid "December"
+msgstr ""
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -161,8 +237,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr ""
 
@@ -174,123 +250,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -442,87 +536,11 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr ""
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr ""
 
@@ -564,17 +582,3 @@ msgstr ""
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 4c12f2aa8c254be65cf5f7ce0a87f1e5d4834846..81c77fd71ea5b97035988ef4b6e4686e65b3e0b4 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -31,46 +31,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -78,11 +78,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr ""
 
@@ -90,137 +90,151 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr ""
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr ""
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -269,36 +283,32 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/pl_PL/files_encryption.po b/l10n/pl_PL/files_encryption.po
index 6512705ecbc0b0ab4db23200fcdbf12a9cdc5536..ce8f0779cae259ed4efa429a111d58f90c5e4e77 100644
--- a/l10n/pl_PL/files_encryption.po
+++ b/l10n/pl_PL/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_PL\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index 40053b76ef77799a9022ce8da35efdd49266a932..38bf131e3e4b897399337dd0b8a121ed3a4104b9 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-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"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: pl_PL\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index 3ce2989bb9939ee7ef49b55e656bed260c2826ee..af7e0260b91e80dba60d4291b21e12b043c47ebb 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+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,51 +17,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr ""
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr ""
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr ""
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 5689bcb950dfdd4e14d759cf19d13a2f047f60f6..3bf2e6878b843447e5dfa42d3e81d5ea3d5b7d97 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+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"
@@ -87,7 +87,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr ""
 
@@ -99,15 +99,15 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr ""
 
@@ -226,11 +226,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr ""
 
@@ -242,26 +242,30 @@ msgstr ""
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index de4bd2f352351d9af0ccb501e3dbb0d9125923a5..36eb526f4640894c57e18af619d68e88defe79b5 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/pl_PL/user_webdavauth.po b/l10n/pl_PL/user_webdavauth.po
index 77261b856393821bcc6eebcac130f8500182bc0f..2ffe7523c4db1a9d706ea27a6e82aeac667ce821 100644
--- a/l10n/pl_PL/user_webdavauth.po
+++ b/l10n/pl_PL/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: pl_PL\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr ""
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/pt_BR/core.po b/l10n/pt_BR/core.po
index ea81e6307e9c38231677459606fee1f47ec6aaef..843960355d60b31260149f6c8df38ec52d74c736 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -27,24 +27,24 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -89,59 +89,135 @@ msgstr "Nenhuma categoria selecionada para deletar."
 msgid "Error removing %s from favorites."
 msgstr "Erro ao remover %s dos favoritos."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Domingo"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Segunda-feira"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "TerÃ§a-feira"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Quarta-feira"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Quinta-feira"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Sexta-feira"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "SÃ¡bado"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Janeiro"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Fevereiro"
+
+#: js/config.php:33
+msgid "March"
+msgstr "MarÃ§o"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Abril"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maio"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Junho"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Julho"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Agosto"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Setembro"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Outubro"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembro"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Dezembro"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ConfiguraÃ§Ãµes"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minuto atrÃ¡s"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrÃ¡s"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 hora atrÃ¡s"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} horas atrÃ¡s"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} dias atrÃ¡s"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ãºltimo mÃªs"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} meses atrÃ¡s"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
@@ -171,8 +247,8 @@ msgid "The object type is not specified."
 msgstr "O tipo de objeto nÃ£o foi especificado."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Erro"
 
@@ -184,123 +260,141 @@ msgstr "O nome do app nÃ£o foi especificado."
 msgid "The required file {file} is not installed!"
 msgstr "O arquivo {file} necessÃ¡rio nÃ£o estÃ¡ instalado!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Erro ao descompartilhar"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissÃµes"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Compartilhado com vocÃª e com o grupo {group} por {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Compartilhado com vocÃª por {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Compartilhar com"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Compartilhar com link"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Proteger com senha"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Senha"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Definir data de expiraÃ§Ã£o"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Data de expiraÃ§Ã£o"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Compartilhar via e-mail:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Nenhuma pessoa encontrada"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "NÃ£o Ã© permitido re-compartilhar"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Compartilhado em {item} com {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "controle de acesso"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "atualizar"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "remover"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiraÃ§Ã£o"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiraÃ§Ã£o"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
@@ -452,87 +546,11 @@ msgstr "Banco de dados do host"
 msgid "Finish setup"
 msgstr "Concluir configuraÃ§Ã£o"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Domingo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Segunda-feira"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "TerÃ§a-feira"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Quarta-feira"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Quinta-feira"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Sexta-feira"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "SÃ¡bado"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Janeiro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Fevereiro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "MarÃ§o"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Abril"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Junho"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Julho"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Agosto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Setembro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Outubro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Novembro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Dezembro"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "web services sob seu controle"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Sair"
 
@@ -574,17 +592,3 @@ msgstr "prÃ³ximo"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Aviso de SeguranÃ§a!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Por favor, verifique a sua senha.<br />Por motivos de seguranÃ§a, vocÃª deverÃ¡ ser solicitado a muda-la ocasionalmente."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 105d7c96385150341cf5c1ab7011432e01c3a461..38713a5ae3cdf7a0663b265fe409ad97f5250b31 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -39,46 +39,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum arquivo foi transferido. Erro desconhecido"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "NÃ£o houve nenhum erro, o arquivo foi transferido com sucesso"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: "
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulÃ¡rio HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "O arquivo foi transferido parcialmente"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Nenhum arquivo foi transferido"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Pasta temporÃ¡ria nÃ£o encontrada"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Falha ao escrever no disco"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -86,11 +86,11 @@ msgstr ""
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Excluir"
 
@@ -98,137 +98,151 @@ msgstr "Excluir"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} jÃ¡ existe"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "sugerir nome"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "substituÃdo {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "SubstituÃdo {old_name} por {new_name} "
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "{files} nÃ£o compartilhados"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} apagados"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome invÃ¡lido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' nÃ£o sÃ£o permitidos."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "gerando arquivo ZIP, isso pode levar um tempo."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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."
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Erro de envio"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Fechar"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "enviando 1 arquivo"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "Enviando {count} arquivos"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL nÃ£o pode ficar em branco"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} arquivos scaneados"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "erro durante verificaÃ§Ã£o"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 arquivo"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} arquivos"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Carregar"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Tratamento de Arquivo"
@@ -277,36 +291,32 @@ msgstr "Pasta"
 msgid "From link"
 msgstr "Do link"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Carregar"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Arquivo muito grande"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Scanning atual"
diff --git a/l10n/pt_BR/files_encryption.po b/l10n/pt_BR/files_encryption.po
index 250fed658f3797f7ac869f90f3d238b0d8b91568..ee24c51910d3dce3ee64b798ee0113a1cd23d3e4 100644
--- a/l10n/pt_BR/files_encryption.po
+++ b/l10n/pt_BR/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 16:57+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Criptografia"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Excluir os seguintes tipos de arquivo da criptografia"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Nenhuma"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Habilitar Criptografia"
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index f310a86a6755d0ffdb08858c18fb3cdf81ada4d6..63442db0efe1ded8d533b28d19ae085cbcec9bd6 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.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-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 15:33+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\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"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirar todas as versÃµes"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "HistÃ³rico"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "VersÃµes"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Isso removerÃ¡ todas as versÃµes de backup existentes dos seus arquivos"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionamento de Arquivos"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index a42adb315bc22e8d3d1f8affe426e69575de0942..f1a550574ba5b1405e3988a3448e119e14c5df6c 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.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-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 18:47+0000\n"
-"Last-Translator: Schopfer <glauber.guimaraes@poli.ufrj.br>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Pessoal"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "UsuÃ¡rios"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "AplicaÃ§Ãµes"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Download ZIP estÃ¡ desligado."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Arquivos precisam ser baixados um de cada vez."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Voltar para Arquivos"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Arquivos selecionados sÃ£o muito grandes para gerar arquivo zip."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "AplicaÃ§Ã£o nÃ£o estÃ¡ habilitada"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Erro de autenticaÃ§Ã£o"
 
@@ -84,55 +88,55 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imagens"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "segundos atrÃ¡s"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minuto atrÃ¡s"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutos atrÃ¡s"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 hora atrÃ¡s"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d horas atrÃ¡s"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hoje"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "ontem"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d dias atrÃ¡s"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ãºltimo mÃªs"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d meses atrÃ¡s"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ãºltimo ano"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 9d7a2512d565922af06296d62284e79ebff200fa..06a011df783b5b41719af8b301d491929704733e 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -7,6 +7,7 @@
 #   <fred.maranhao@gmail.com>, 2012.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 #   <philippi.sedir@gmail.com>, 2012.
+# Rodrigo Tavares <rodrigo.st23@hotmail.com>, 2013.
 # Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
 #   <targinosilveira@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
@@ -16,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -96,9 +97,9 @@ msgstr "Habilitado"
 msgid "Saving..."
 msgstr "Gravando..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
-msgstr "PortuguÃªs"
+msgstr "PortuguÃªs do Brasil"
 
 #: templates/apps.php:10
 msgid "Add your App"
@@ -108,15 +109,15 @@ msgstr "Adicione seu Aplicativo"
 msgid "More Apps"
 msgstr "Mais Apps"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selecione uma AplicaÃ§Ã£o"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver pÃ¡gina do aplicativo em apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
@@ -165,7 +166,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Senha"
 
@@ -235,11 +236,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nome"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupos"
 
@@ -251,26 +252,30 @@ msgstr "Criar"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo Administrativo"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index fdd9c02d90ada07169387703e90f075f630b048e..7596db8ad375a50b8613bf6946cdb7b818bf2ec6 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr "VocÃª pode omitir o protocolo, exceto quando requerer SSL. EntÃ£o inicie
 msgid "Base DN"
 msgstr "DN Base"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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"
@@ -115,10 +119,18 @@ msgstr "Porta"
 msgid "Base User Tree"
 msgstr "Ãrvore de UsuÃ¡rio Base"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Ãrvore de Grupo Base"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "AssociaÃ§Ã£o Grupo-Membro"
diff --git a/l10n/pt_BR/user_webdavauth.po b/l10n/pt_BR/user_webdavauth.po
index febd61f9ee5155dafef06a5edb5da2dfff705c92..db7d62a36b829915dc7ecc8e208b7c2007c3ee25 100644
--- a/l10n/pt_BR/user_webdavauth.po
+++ b/l10n/pt_BR/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: pt_BR\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/pt_PT/core.po b/l10n/pt_PT/core.po
index ba200a600546a59e0b98d370f172831974cf2cdf..afaa00874d646d4db58585a17abb6a04431f2d6e 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -4,6 +4,8 @@
 # 
 # Translators:
 #   <daniel@mouxy.net>, 2012-2013.
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+#  <duartegrilo@gmail.com>, 2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
 #   <helder.meneses@gmail.com>, 2011, 2012.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
@@ -13,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -23,24 +25,24 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "O utilizador %s partilhou um ficheiro consigo."
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "O utilizador %s partilhou uma pasta consigo."
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "O utilizador %s partilhou o ficheiro \"%s\" consigo. EstÃ¡ disponÃvel para download aqui: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -78,66 +80,142 @@ msgstr "Erro a adicionar %s aos favoritos"
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
-msgstr "Nenhuma categoria seleccionar para eliminar"
+msgstr "Nenhuma categoria seleccionada para apagar"
 
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
 msgstr "Erro a remover %s dos favoritos."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Domingo"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Segunda"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "TerÃ§a"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Quarta"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Quinta"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Sexta"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "SÃ¡bado"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Janeiro"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Fevereiro"
+
+#: js/config.php:33
+msgid "March"
+msgstr "MarÃ§o"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Abril"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maio"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Junho"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Julho"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Agosto"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Setembro"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Outubro"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembro"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Dezembro"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "DefiniÃ§Ãµes"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Minutos atrÃ¡s"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
-msgstr "Falta 1 minuto"
+msgstr "HÃ¡ 1 minuto"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutos atrÃ¡s"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "HÃ¡ 1 hora"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "HÃ¡ {hours} horas atrÃ¡s"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "hoje"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "ontem"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} dias atrÃ¡s"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "ultÃmo mÃªs"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "HÃ¡ {months} meses atrÃ¡s"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "meses atrÃ¡s"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "ano passado"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "anos atrÃ¡s"
 
@@ -167,8 +245,8 @@ msgid "The object type is not specified."
 msgstr "O tipo de objecto nÃ£o foi especificado"
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Erro"
 
@@ -180,122 +258,140 @@ msgstr "O nome da aplicaÃ§Ã£o nÃ£o foi especificado"
 msgid "The required file {file} is not installed!"
 msgstr "O ficheiro necessÃ¡rio {file} nÃ£o estÃ¡ instalado!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Erro ao deixar de partilhar"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Erro ao mudar permissÃµes"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Partilhado consigo e com o grupo {group} por {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Partilhado consigo por {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Partilhar com"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Partilhar com link"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Proteger com palavra-passe"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Palavra chave"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Enviar o link por e-mail"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Enviar"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Especificar data de expiraÃ§Ã£o"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Data de expiraÃ§Ã£o"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Partilhar via email:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "NÃ£o foi encontrado ninguÃ©m"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "NÃ£o Ã© permitido partilhar de novo"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Partilhado em {item} com {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "Controlo de acesso"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "apagar"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiraÃ§Ã£o"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiraÃ§Ã£o"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "A Enviar..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
-msgstr "E-mail enviado com sucesso!"
+msgstr "E-mail enviado"
+
+#: js/update.js:14
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr "A actualizaÃ§Ã£o falhou. Por favor reporte este incidente seguindo este link <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 "A actualizaÃ§Ã£o foi concluÃda com sucesso. Vai ser redireccionado para o ownCloud agora."
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -332,7 +428,7 @@ msgstr "A sua password foi reposta"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
-msgstr "Para a pÃ¡gina de conexÃ£o"
+msgstr "Para a pÃ¡gina de entrada"
 
 #: lostpassword/templates/resetpassword.php:8
 msgid "New password"
@@ -442,93 +538,17 @@ msgstr "Tablespace da base de dados"
 
 #: templates/installation.php:129
 msgid "Database host"
-msgstr "Host da base de dados"
+msgstr "AnfitriÃ£o da base de dados"
 
 #: templates/installation.php:134
 msgid "Finish setup"
 msgstr "Acabar instalaÃ§Ã£o"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Domingo"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Segunda"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "TerÃ§a"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Quarta"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Quinta"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Sexta"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "SÃ¡bado"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Janeiro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Fevereiro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "MarÃ§o"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Abril"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maio"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Junho"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Julho"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Agosto"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Setembro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Outubro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Novembro"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Dezembro"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "serviÃ§os web sob o seu controlo"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Sair"
 
@@ -548,7 +568,7 @@ msgstr "Por favor mude a sua palavra-passe para assegurar a sua conta de novo."
 
 #: templates/login.php:19
 msgid "Lost your password?"
-msgstr "Esqueceu a sua password?"
+msgstr "Esqueceu-se da sua password?"
 
 #: templates/login.php:39
 msgid "remember"
@@ -569,18 +589,4 @@ msgstr "seguinte"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr "A Actualizar o ownCloud para a versÃ£o %s, esta operaÃ§Ã£o pode demorar."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Aviso de SeguranÃ§a!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Por favor verifique a sua palavra-passe. <br/>Por razÃµes de seguranÃ§a, pode ser-lhe perguntada, ocasionalmente, a sua palavra-passe de novo."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verificar"
+msgstr "A actualizar o ownCloud para a versÃ£o %s, esta operaÃ§Ã£o pode demorar."
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 74b9f45b855b310980e07ba8d2a3738bd93034ff..38429e8ec21171fb5d4dff26cc10c9b66f8107ff 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -4,6 +4,8 @@
 # 
 # Translators:
 #   <daniel@mouxy.net>, 2012-2013.
+# Daniel Pinto <daniel@mouxy.net>, 2013.
+#  <duartegrilo@gmail.com>, 2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
 #   <geral@ricardolameiro.pt>, 2012.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
@@ -12,9 +14,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-09 23:21+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2013-01-29 00:04+0100\n"
+"PO-Revision-Date: 2013-01-28 17:06+0000\n"
+"Last-Translator: Duarte Velez Grilo <duartegrilo@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"
@@ -36,46 +38,46 @@ msgstr "NÃ£o foi possÃvel move o ficheiro %s"
 msgid "Unable to rename file"
 msgstr "NÃ£o foi possÃvel renomear o ficheiro"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Nenhum ficheiro foi carregado. Erro desconhecido"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Sem erro, ficheiro enviado com sucesso"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "O ficheiro enviado excede o limite permitido na directiva do php.ini upload_max_filesize"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "O ficheiro enviado excede o diretivo MAX_FILE_SIZE especificado no formulÃ¡rio HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "O ficheiro enviado sÃ³ foi enviado parcialmente"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "NÃ£o foi enviado nenhum ficheiro"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Falta uma pasta temporÃ¡ria"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Falhou a escrita no disco"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "EspaÃ§o em disco insuficiente!"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "NÃ£o hÃ¡ espaÃ§o suficiente em disco"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "DirectÃ³rio InvÃ¡lido"
 
@@ -83,11 +85,11 @@ msgstr "DirectÃ³rio InvÃ¡lido"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Apagar"
 
@@ -95,137 +97,151 @@ msgstr "Apagar"
 msgid "Rename"
 msgstr "Renomear"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "O nome {new_name} jÃ¡ existe"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
-msgstr "Sugira um nome"
+msgstr "sugira um nome"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "{new_name} substituido"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "substituido {new_name} por {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "{files} nÃ£o partilhado(s)"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "{files} eliminado(s)"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' nÃ£o Ã© um nome de ficheiro vÃ¡lido!"
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "O nome do ficheiro nÃ£o pode estar vazio."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nome InvÃ¡lido, os caracteres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' nÃ£o sÃ£o permitidos."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "a gerar o ficheiro ZIP, poderÃ¡ demorar algum tempo."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "O seu armazenamento estÃ¡ cheio, os ficheiros nÃ£o podem ser sincronizados."
+
+#: js/files.js:82
+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:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Erro no envio"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Fechar"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "A enviar 1 ficheiro"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "A carregar {count} ficheiros"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
-msgstr "O envio foi cancelado."
+msgstr "Envio cancelado."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "O URL nÃ£o pode estar vazio."
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} ficheiros analisados"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "erro ao analisar"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nome"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 pasta"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} pastas"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 ficheiro"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} ficheiros"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Enviar"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Manuseamento de ficheiros"
@@ -274,36 +290,32 @@ msgstr "Pasta"
 msgid "From link"
 msgstr "Da ligaÃ§Ã£o"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Enviar"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Cancelar envio"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envie alguma coisa!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Envio muito grande"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estÃ£o a ser analisados, por favor aguarde."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "AnÃ¡lise actual"
diff --git a/l10n/pt_PT/files_encryption.po b/l10n/pt_PT/files_encryption.po
index 803037caf42d2c2db8bae5e30b13ac67e0d6df3a..0ae4844da6fdffe381313161a61abec3b98d37fb 100644
--- a/l10n/pt_PT/files_encryption.po
+++ b/l10n/pt_PT/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Daniel Pinto <daniel@mouxy.net>, 2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 13:24+0000\n"
-"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
+"POT-Creation-Date: 2013-01-24 00:06+0100\n"
+"PO-Revision-Date: 2013-01-23 01:09+0000\n"
+"Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +19,66 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Por favor, use o seu cliente de sincronizaÃ§Ã£o do ownCloud e altere a sua password de encriptaÃ§Ã£o para concluÃr a conversÃ£o."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "Alterado para encriptaÃ§Ã£o do lado do cliente"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Alterar a password de encriptaÃ§Ã£o para a password de login"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Por favor verifique as suas paswords e tente de novo."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "NÃ£o foi possÃvel alterar a password de encriptaÃ§Ã£o de ficheiros para a sua password de login"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Escolha o mÃ©todo de encriptaÃ§Ã£o"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "EncriptaÃ§Ã£o do lado do cliente (mais seguro mas torna possÃvel o acesso aos dados atravÃ©s do interface web)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "EncriptaÃ§Ã£o do lado do servidor (permite o acesso aos seus ficheiros atravÃ©s do interface web e do cliente de sincronizaÃ§Ã£o)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Nenhuma (sem encriptaÃ§Ã£o)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Importante: Uma vez escolhido o modo de encriptaÃ§Ã£o, nÃ£o existe maneira de o alterar!"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "Escolhido pelo utilizador"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "EncriptaÃ§Ã£o"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Excluir da encriptaÃ§Ã£o os seguintes tipo de ficheiros"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Nenhum"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activar EncriptaÃ§Ã£o"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 0a78dc0df95f34aee328489e38af285229175feb..596deab439655d4c5456ff5030ebfe3472d7a5d1 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/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: 2012-10-01 02:04+0200\n"
-"PO-Revision-Date: 2012-09-30 22:21+0000\n"
-"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Expirar todas as versÃµes"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "HistÃ³rico"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "VersÃµes"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Isto irÃ¡ apagar todas as versÃµes de backup do seus ficheiros"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionamento de Ficheiros"
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index fe66807cc3a3408ac523a423b75ad689005badb9..b9d558cbb40f91eb8e47f97f4f2d22ab664d8e70 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012.
+#   <daniel@mouxy.net>, 2012-2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 00:33+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 00:47+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"
@@ -19,51 +19,55 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Pessoal"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "ConfiguraÃ§Ãµes"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Utilizadores"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "AplicaÃ§Ãµes"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Descarregamento em ZIP estÃ¡ desligado."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Os ficheiros precisam de ser descarregados um por um."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Voltar a Ficheiros"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Os ficheiros seleccionados sÃ£o grandes demais para gerar um ficheiro zip."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr "NÃ£o foi possÃvel determinar"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "A aplicaÃ§Ã£o nÃ£o estÃ¡ activada"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Erro na autenticaÃ§Ã£o"
 
@@ -83,55 +87,55 @@ msgstr "Texto"
 msgid "Images"
 msgstr "Imagens"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "hÃ¡ alguns segundos"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "hÃ¡ 1 minuto"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "hÃ¡ %d minutos"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "HÃ¡ 1 horas"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "HÃ¡ %d horas"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hoje"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "ontem"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "hÃ¡ %d dias"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "mÃªs passado"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "HÃ¡ %d meses atrÃ¡s"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "ano passado"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "hÃ¡ anos"
 
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 3d663773c5fcdc914c412ae79d2567d51821051f..a2de9c1e4c6f3a808a72160c85f00de4d4b8bf37 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr "Activar"
 msgid "Saving..."
 msgstr "A guardar..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -104,15 +104,15 @@ msgstr "Adicione a sua aplicaÃ§Ã£o"
 msgid "More Apps"
 msgstr "Mais AplicaÃ§Ãµes"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Selecione uma aplicaÃ§Ã£o"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Ver a pÃ¡gina da aplicaÃ§Ã£o em apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
@@ -161,7 +161,7 @@ msgstr "Transferir o cliente android"
 msgid "Download iOS Client"
 msgstr "Transferir o cliente iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Palavra-chave"
 
@@ -231,11 +231,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nome"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupos"
 
@@ -247,26 +247,30 @@ msgstr "Criar"
 msgid "Default Storage"
 msgstr "Armazenamento PadrÃ£o"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Outro"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupo Administrador"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "PadrÃ£o"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Apagar"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 2ecb6bd3751e2478bbbc479adbb77667522b47f4..734a694ccec2c4498ab07bd3ae7087ee85e949c4 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012.
+#   <daniel@mouxy.net>, 2012-2013.
 # Duarte Velez Grilo <duartegrilo@gmail.com>, 2012.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
 # Nelson Rosado <nelsontrosado@gmail.com>, 2012.
@@ -11,8 +11,8 @@ 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:25+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 00:52+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"
@@ -30,9 +30,9 @@ msgstr "<b>Aviso:</b> A aplicaÃ§Ã£o user_ldap e user_webdavauth sÃ£o incompative
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Aviso:</b> O mÃ³dulo PHP LDAP necessÃ¡rio nÃ£o estÃ¡ instalado, o backend nÃ£o irÃ¡ funcionar. PeÃ§a ao seu administrador para o instalar."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Aviso:</b> O mÃ³dulo PHP LDAP nÃ£o estÃ¡ instalado, logo nÃ£o irÃ¡ funcionar. Por favor peÃ§a ao administrador para o instalar."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -47,6 +47,10 @@ msgstr "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comec
 msgid "Base DN"
 msgstr "DN base"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Uma base DN por linho"
+
 #: templates/settings.php:16
 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"
@@ -118,10 +122,18 @@ msgstr "Porto"
 msgid "Base User Tree"
 msgstr "Base da Ã¡rvore de utilizadores."
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Uma base de utilizador DN por linha"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Base da Ã¡rvore de grupos."
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Uma base de grupo DN por linha"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Associar utilizador ao grupo."
diff --git a/l10n/pt_PT/user_webdavauth.po b/l10n/pt_PT/user_webdavauth.po
index f34c1b223dfb456e946ffcd62f8fd5c8044344ca..6f6d78b3df7d945157b6ae3e881fe4e97cb614ec 100644
--- a/l10n/pt_PT/user_webdavauth.po
+++ b/l10n/pt_PT/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <daniel@mouxy.net>, 2012.
+#   <daniel@mouxy.net>, 2012-2013.
 # Helder Meneses <helder.meneses@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-22 00:24+0100\n"
-"PO-Revision-Date: 2012-12-20 23:46+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 00:54+0000\n"
 "Last-Translator: Mouxy <daniel@mouxy.net>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "AutenticaÃ§Ã£o WebDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "O ownCloud vai enviar as credenciais para este URL. Todos os cÃ³digos http 401 e 403 serÃ£o interpretados como credenciais invÃ¡lidas, todos os restantes cÃ³digos http serÃ£o interpretados como credenciais correctas."
+"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 "O ownCloud vai enviar as credenciais do utilizador atravÃ©s deste URL. Este plugin verifica a resposta e vai interpretar os cÃ³digos de estado HTTP 401 e 403 como credenciais invÃ¡lidas, e todas as outras como vÃ¡lidas."
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 509e2c92f27ab73358389eb88eeb5ae1e5b3190e..8bf554fdbea3dc6e4783dace79f9a31b33a48d72 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -5,6 +5,7 @@
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
 # Dimon Pockemon <>, 2012.
+# Dumitru Ursu <>, 2013.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 #   <g.ciprian@osn.ro>, 2012.
 #   <laur.cristescu@gmail.com>, 2012.
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -22,29 +23,29 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Utilizatorul %s a partajat un fiÈ™ier cu tine"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Utilizatorul %s a partajat un dosar cu tine"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "Utilizatorul %s a partajat fiÈ™ierul \"%s\" cu tine. ÃŽl poÈ›i descÄƒrca de aici: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "Utilizatorul %s a partajat dosarul \"%s\" cu tine. ÃŽl poÈ›i descÄƒrca de aici: %s "
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -68,12 +69,12 @@ msgstr "Tipul obiectului nu este prevazut"
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "ID-ul %s nu a fost introdus"
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Eroare la adÄƒugarea %s la favorite"
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -82,61 +83,137 @@ msgstr "Nici o categorie selectatÄƒ pentru È™tergere."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Eroare la È™tergerea %s din favorite"
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr "DuminicÄƒ"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Luni"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "MarÈ›i"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Miercuri"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Joi"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Vineri"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "SÃ¢mbÄƒtÄƒ"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:33
+msgid "January"
+msgstr "Ianuarie"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februarie"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Martie"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Aprilie"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Mai"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Iunie"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Iulie"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Septembrie"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Octombrie"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Noiembrie"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Decembrie"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ConfigurÄƒri"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "secunde Ã®n urmÄƒ"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minut Ã®n urmÄƒ"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minute in urma"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Acum o ora"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
-msgstr ""
+msgstr "{hours} ore Ã®n urmÄƒ"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "astÄƒzi"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} zile in urma"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "ultima lunÄƒ"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
-msgstr ""
+msgstr "{months} luni Ã®n urmÄƒ"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "luni Ã®n urmÄƒ"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "ani Ã®n urmÄƒ"
 
@@ -163,137 +240,155 @@ 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 ""
+msgstr "Tipul obiectului nu a fost specificat"
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Eroare"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "Numele aplicaÈ›iei nu a fost specificat"
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
+msgstr "FiÈ™ierul obligatoriu {file} nu este instalat!"
+
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Share"
+msgstr ""
+
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Shared"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Eroare la anularea partajÄƒrii"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Eroare la modificarea permisiunilor"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Distribuie cu tine si grupul {group} de {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Distribuie cu tine de {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Partajat cu"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Partajare cu legÄƒturÄƒ"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Protejare cu parolÄƒ"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Parola"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
-msgstr ""
+msgstr "ExpediazÄƒ legÄƒtura prin poÈ™ta electronicÄƒ"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
-msgstr ""
+msgstr "ExpediazÄƒ"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "SpecificÄƒ data expirÄƒrii"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Data expirÄƒrii"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Distribuie prin email:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Nici o persoanÄƒ gÄƒsitÄƒ"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisÄƒ"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Distribuie in {item} si {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "poate edita"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "control acces"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "actualizare"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "È™tergere"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Protejare cu parolÄƒ"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
-msgstr ""
+msgstr "Se expediazÄƒ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
+msgstr "Mesajul a fost expediat"
+
+#: 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:47
@@ -447,87 +542,11 @@ msgstr "BazÄƒ date"
 msgid "Finish setup"
 msgstr "FinalizeazÄƒ instalarea"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "DuminicÄƒ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Luni"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "MarÈ›i"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Miercuri"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Joi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Vineri"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "SÃ¢mbÄƒtÄƒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Ianuarie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februarie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Martie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Aprilie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Mai"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Iunie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Iulie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Septembrie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Octombrie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Noiembrie"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Decembrie"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "IeÈ™ire"
 
@@ -568,18 +587,4 @@ msgstr "urmÄƒtorul"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Advertisment de Securitate"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Te rog verifica parola. <br/>Pentru securitate va poate fi cerut ocazional introducerea parolei din nou"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifica"
+msgstr "ActualizÄƒm ownCloud la versiunea %s, aceasta poate dura cÃ¢teva momente."
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 4c4093cbf4d367ee5e32e102db8c7d8cbfb842c6..e5a64577ebcceb53deb6506564d29e5c8c08a996 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -3,8 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
+# Claudiu  <claudiu@tanaselia.ro>, 2011-2013.
 # Dimon Pockemon <>, 2012.
+# Dumitru Ursu <>, 2013.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 #   <g.ciprian@osn.ro>, 2012-2013.
 #   <laur.cristescu@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 13:23+0000\n"
-"Last-Translator: g.ciprian <g.ciprian@osn.ro>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -25,7 +26,7 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Nu se poate de mutat %s - FiÈ™ier cu acest nume deja existÄƒ"
 
 #: ajax/move.php:24
 #, php-format
@@ -36,46 +37,46 @@ msgstr "Nu s-a putut muta %s"
 msgid "Unable to rename file"
 msgstr "Nu s-a putut redenumi fiÈ™ierul"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Nici un fiÈ™ier nu a fost Ã®ncÄƒrcat. Eroare necunoscutÄƒ"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Nicio eroare, fiÈ™ierul a fost Ã®ncÄƒrcat cu succes"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Fisierul incarcat depaseste upload_max_filesize permisi in php.ini: "
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "FiÈ™ierul are o dimensiune mai mare decÃ¢t variabile MAX_FILE_SIZE specificatÄƒ Ã®n formularul HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "FiÈ™ierul a fost Ã®ncÄƒrcat doar parÈ›ial"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Niciun fiÈ™ier Ã®ncÄƒrcat"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "LipseÈ™te un dosar temporar"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Eroare la scriere pe disc"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Nu este suficient spaÈ›iu disponibil"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Director invalid."
 
@@ -83,11 +84,11 @@ msgstr "Director invalid."
 msgid "Files"
 msgstr "FiÈ™iere"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "AnuleazÄƒ partajarea"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "È˜terge"
 
@@ -95,137 +96,151 @@ msgstr "È˜terge"
 msgid "Rename"
 msgstr "Redenumire"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} deja exista"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ã®nlocuire"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "sugereazÄƒ nume"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "anulare"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "inlocuit {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "AnuleazÄƒ ultima acÈ›iune"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} inlocuit cu {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "nedistribuit {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "Sterse {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' este un nume invalid de fiÈ™ier."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Numele fiÈ™ierului nu poate rÄƒmÃ¢ne gol."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Nume invalid, '\\', '/', '<', '>', ':', '\"', '|', '?' si '*' nu sunt permise."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "se generazÄƒ fiÈ™ierul ZIP, va dura ceva timp."
+#: 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:219
+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:224
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Eroare la Ã®ncÄƒrcare"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "ÃŽnchide"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ÃŽn aÈ™teptare"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "un fiÈ™ier se Ã®ncarcÄƒ"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} fisiere incarcate"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ÃŽncÄƒrcare anulatÄƒ."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Adresa URL nu poate fi goalÄƒ."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "Invalid folder name. Usage of 'Shared' is reserved by Ownclou"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} fisiere scanate"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "eroare la scanarea"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Nume"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 folder"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} foldare"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 fisier"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} fisiere"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ÃŽncarcÄƒ"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Manipulare fiÈ™iere"
@@ -274,36 +289,32 @@ msgstr "Dosar"
 msgid "From link"
 msgstr "de la adresa"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ÃŽncarcÄƒ"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "AnuleazÄƒ Ã®ncÄƒrcarea"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. ÃŽncarcÄƒ ceva!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "DescarcÄƒ"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "FiÈ™ierul Ã®ncÄƒrcat este prea mare"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "FiÈ™ierele sunt scanate, te rog aÈ™teptÄƒ."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "ÃŽn curs de scanare"
diff --git a/l10n/ro/files_encryption.po b/l10n/ro/files_encryption.po
index 2c3a3ed30b0b3b5a1d8d5bbd33191dc917de13a5..504f72e85c45c8ff4ab85d702a6f6bacd6886740 100644
--- a/l10n/ro/files_encryption.po
+++ b/l10n/ro/files_encryption.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dumitru Ursu <>, 2013.
 #   <g.ciprian@osn.ro>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-19 02:02+0200\n"
-"PO-Revision-Date: 2012-09-18 11:31+0000\n"
-"Last-Translator: g.ciprian <g.ciprian@osn.ro>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 00:05+0000\n"
+"Last-Translator: Dimon Pockemon <>\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"
@@ -18,18 +19,66 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "Te rugÄƒm sÄƒ mergi Ã®n clientul ownCloud È™i sÄƒ schimbi parola pentru a finisa conversia"
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "setat la encriptare localÄƒ"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "SchimbÄƒ parola de ecriptare Ã®n parolÄƒ de acces"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "VerificÄƒ te rog parolele È™i Ã®nceracÄƒ din nou."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Nu s-a putut schimba parola de encripÈ›ie a fiÈ™ierelor ca parolÄƒ de acces"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Alege tipul de ecripÈ›ie"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "EncripÈ›ie localÄƒ (cea mai sigurÄƒ, dar face ca datele sÄƒ nu mai fie accesibile din interfaÈ›a web)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "EncripÈ›ie pe server (permite sÄƒ accesezi datele tale din interfaÈ›a web È™i din clientul pentru calculator)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "FÄƒrÄƒ (nici un fel de ecriptare)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Important: Din moment ce ai setat un mod de encriptare, nu mai existÄƒ metode de a-l schimba Ã®napoi"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "Spefic fiecÄƒrui utilizator (lasÄƒ utilizatorul sÄƒ decidÄƒ)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "ÃŽncriptare"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Exclude urmÄƒtoarele tipuri de fiÈ™iere de la Ã®ncriptare"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Niciuna"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Activare Ã®ncriptare"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index a2cf379cc42cc0e753830d1ec33c3cb9a20df369..fd43a0fd65b407d2b749575a960e1fdc80be7fe3 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dumitru Ursu <>, 2013.
 #   <g.ciprian@osn.ro>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 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-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-25 23:25+0000\n"
+"Last-Translator: Dimon Pockemon <>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,40 +21,40 @@ msgstr ""
 
 #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
 msgid "Access granted"
-msgstr ""
+msgstr "Acces permis"
 
 #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
 msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Eroare la configurarea mediului de stocare Dropbox"
 
 #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
 msgid "Grant access"
-msgstr ""
+msgstr "Permite accesul"
 
 #: js/dropbox.js:73 js/google.js:72
 msgid "Fill out all required fields"
-msgstr ""
+msgstr "CompleteazÄƒ toate cÃ¢mpurile necesare"
 
 #: js/dropbox.js:85
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "PrezintÄƒ te rog o cheie de Dropbox validÄƒ È™i parola"
 
 #: js/google.js:26 js/google.js:73 js/google.js:78
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Eroare la configurarea mediului de stocare Google Drive"
 
 #: lib/config.php:434
 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>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
 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>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."
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -100,7 +101,7 @@ msgid "Users"
 msgstr "Utilizatori"
 
 #: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
 msgid "Delete"
 msgstr "È˜terge"
 
@@ -112,10 +113,10 @@ msgstr "Permite stocare externÄƒ pentru utilizatori"
 msgid "Allow users to mount their own external storage"
 msgstr "Permite utilizatorilor sÄƒ monteze stocare externÄƒ proprie"
 
-#: templates/settings.php:139
+#: templates/settings.php:136
 msgid "SSL root certificates"
 msgstr "Certificate SSL root"
 
-#: templates/settings.php:158
+#: templates/settings.php:153
 msgid "Import Root Certificate"
 msgstr "ImportÄƒ certificat root"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index d3058eb6ed299487e029475b055047fe5e4200bc..28514d6ddd3f59a7b93ebaada49b7fdc7d563820 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/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: 2012-09-27 02:01+0200\n"
-"PO-Revision-Date: 2012-09-26 13:05+0000\n"
-"Last-Translator: g.ciprian <g.ciprian@osn.ro>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "ExpirÄƒ toate versiunile"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Istoric"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versiuni"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "AceastÄƒ acÈ›iune va È™terge toate versiunile salvate ale fiÈ™ierelor tale"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionare fiÈ™iere"
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index 3cfb1c4c4a05c86f36ce679b2ef3be8350eb1e9c..a48eb334748bf48914e8f357277d80e41b237dc4 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dumitru Ursu <>, 2013.
 #   <g.ciprian@osn.ro>, 2012.
 #   <laur.cristescu@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 05:14+0000\n"
-"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
+"POT-Creation-Date: 2013-01-26 00:09+0100\n"
+"PO-Revision-Date: 2013-01-25 21:31+0000\n"
+"Last-Translator: Dimon Pockemon <>\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,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:287
+#: app.php:301
 msgid "Help"
 msgstr "Ajutor"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "SetÄƒri"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "Utilizatori"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "AplicaÈ›ii"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
@@ -59,11 +60,15 @@ msgstr "ÃŽnapoi la fiÈ™iere"
 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:229
+msgid "couldn't be determined"
+msgstr "nu poate fi determinat"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "AplicaÈ›ia nu este activatÄƒ"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Eroare la autentificare"
 
@@ -83,55 +88,55 @@ msgstr "Text"
 msgid "Images"
 msgstr "Imagini"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "secunde Ã®n urmÄƒ"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minut Ã®n urmÄƒ"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minute Ã®n urmÄƒ"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Acum o ora"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d ore in urma"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "astÄƒzi"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "ieri"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d zile Ã®n urmÄƒ"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "ultima lunÄƒ"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d luni in urma"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "ultimul an"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "ani Ã®n urmÄƒ"
 
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 280c113895e2e3605d3662bb115ff46742af3f7e..9773ea8fcedb5816746f613166ba0f8049da837e 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -5,6 +5,7 @@
 # Translators:
 # Claudiu  <claudiu@tanaselia.ro>, 2011, 2012.
 # Dimon Pockemon <>, 2012.
+# Dumitru Ursu <>, 2013.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 #   <g.ciprian@osn.ro>, 2012-2013.
 #   <icewind1991@gmail.com>, 2012.
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -69,7 +70,7 @@ msgstr "Cerere eronatÄƒ"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Administratorii nu se pot È™terge singuri din grupul admin"
 
 #: ajax/togglegroups.php:28
 #, php-format
@@ -93,7 +94,7 @@ msgstr "ActivaÈ›i"
 msgid "Saving..."
 msgstr "Salvez..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "_language_name_"
 
@@ -105,15 +106,15 @@ msgstr "AdaugÄƒ aplicaÈ›ia ta"
 msgid "More Apps"
 msgstr "Mai multe aplicaÈ›ii"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "SelecteazÄƒ o aplicaÈ›ie"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "VizualizeazÄƒ pagina applicaÈ›iei pe apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licenÈ›iat <span class=\"author\"></span>"
 
@@ -144,7 +145,7 @@ msgstr "Suport comercial"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "AÈ›i utilizat <strong>%s</strong> din <strong>%s</strong> disponibile"
 
 #: templates/personal.php:12
 msgid "Clients"
@@ -162,7 +163,7 @@ msgstr "DescarcÄƒ client Android"
 msgid "Download iOS Client"
 msgstr "DescarcÄƒ client iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ParolÄƒ"
 
@@ -216,7 +217,7 @@ msgstr "WebDAV"
 
 #: templates/personal.php:54
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "FoloseÈ™te aceastÄƒ adresÄƒ pentru a conecta ownCloud cu managerul de fiÈ™iere"
 
 #: templates/personal.php:63
 msgid "Version"
@@ -232,11 +233,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Nume"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupuri"
 
@@ -248,26 +249,30 @@ msgstr "CreazÄƒ"
 msgid "Default Storage"
 msgstr "Stocare implicitÄƒ"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "NelimitatÄƒ"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Altele"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Grupul Admin "
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Stocare"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "ImplicitÄƒ"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "È˜terge"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 171e91b27d429a5efecb503685d47c96b2ecb4d8..a57e18531e181a2f12efe5539f86236fe76f78e5 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dumitru Ursu <>, 2012.
+# Dumitru Ursu <>, 2012-2013.
 #   <iuranemo@gmail.com>, 2012.
 #   <laur.cristescu@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 05:09+0000\n"
-"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
+"POT-Creation-Date: 2013-01-26 00:09+0100\n"
+"PO-Revision-Date: 2013-01-25 23:02+0000\n"
+"Last-Translator: Dimon Pockemon <>\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"
@@ -29,9 +29,9 @@ msgstr "<b>Atentie:</b> Apps user_ldap si user_webdavauth sunt incompatibile. Es
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Atentie:</b Modulul PHP LDAP care este necesar nu este instalat. Va rugam intrebati administratorul de sistem instalarea acestuia"
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>AtenÈ›ie</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcÈ›iona. ContacteazÄƒ administratorul sistemului pentru al instala."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -46,6 +46,10 @@ msgstr "PuteÈ›i omite protocolul, decÃ¢t dacÄƒ folosiÈ›i SSL. Atunci se Ã®ncepe
 msgid "Base DN"
 msgstr "DN de bazÄƒ"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Un Base DN pe linie"
+
 #: templates/settings.php:16
 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"
@@ -117,10 +121,18 @@ msgstr "Portul"
 msgid "Base User Tree"
 msgstr "Arborele de bazÄƒ al Utilizatorilor"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "Un User Base DN pe linie"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Arborele de bazÄƒ al Grupurilor"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "Un Group Base DN pe linie"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asocierea Grup-Membru"
diff --git a/l10n/ro/user_webdavauth.po b/l10n/ro/user_webdavauth.po
index 7c83e127d1ce2c1907fdd64333f95c28778e749a..1f11c76068bbe3713e58adf9250894ae60087fb1 100644
--- a/l10n/ro/user_webdavauth.po
+++ b/l10n/ro/user_webdavauth.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Dumitru Ursu <>, 2013.
 #   <laur.cristescu@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 05:17+0000\n"
-"Last-Translator: laurentiucristescu <laur.cristescu@gmail.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 00:09+0000\n"
+"Last-Translator: Dimon Pockemon <>\n"
 "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"
@@ -18,13 +19,17 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "Autentificare WebDAV"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "owncloud  va trimite acreditatile de utilizator pentru a interpreta aceasta pagina. Http 401 si Http 403 are acreditarile si orice alt cod gresite ca acreditarile corecte"
+"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 va trimite datele de autentificare la acest URL. Acest modul verificÄƒ rÄƒspunsul È™i va interpreta codurile de status HTTP 401 sau 403 ca fiind date de autentificare invalide, È™i orice alt rÄƒspuns ca fiind date valide."
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 009519123049b54cd703ddc8fe70da8601599aea..bcc0d346275aa69d790831e558219c80b4ac7d5c 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 11:49+0000\n"
-"Last-Translator: adol <sharov3@gmail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,24 +27,24 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¿Ð¾Ð´ÐµÐ»Ð¸Ð»ÑÑ Ñ Ð²Ð°Ð¼Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð¼"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð²Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ð°Ð¿ÐºÐµ"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -89,59 +89,135 @@ msgstr "ÐÐµÑ‚ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¹ Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ."
 msgid "Error removing %s from favorites."
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s Ð¸Ð· Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Ð¡Ñ€ÐµÐ´Ð°"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Ð¯Ð½Ð²Ð°Ñ€ÑŒ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ÐœÐ°Ñ€Ñ‚"
+
+#: js/config.php:33
+msgid "April"
+msgstr "ÐÐ¿Ñ€ÐµÐ»ÑŒ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "ÐœÐ°Ð¹"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Ð˜ÑŽÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Ð˜ÑŽÐ»ÑŒ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ"
+
+#: js/config.php:33
+msgid "October"
+msgstr "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ"
+
+#: js/config.php:33
+msgid "November"
+msgstr "ÐÐ¾ÑÐ±Ñ€ÑŒ"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ÑÐµÐ³Ð¾Ð´Ð½Ñ"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ð½ÐµÑÐºÐ¾Ð»ÑŒÐºÐ¾ Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
@@ -171,8 +247,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
@@ -184,123 +260,141 @@ msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾"
 msgid "The required file {file} is not installed!"
 msgstr "ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» {file} Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð°ÐºÑ€Ñ‹Ñ‚Ð¸Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑÐ¼ÐµÐ½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½Ð¸Ð¹"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner} Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð»Ñ Ð’Ð°Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ {group} "
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "{owner} Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑŒÑÑ Ñ"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑŒÑÑ Ñ ÑÑÑ‹Ð»ÐºÐ¾Ð¹"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Ð—Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "ÐŸÐ¾Ñ‡Ñ‚Ð¾Ð²Ð°Ñ ÑÑÑ‹Ð»ÐºÐ° Ð½Ð° Ð¿ÐµÑ€ÑÐ¾Ð½Ñƒ"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ€Ð¾Ðº Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¾ÐºÐ¾Ð½Ñ‡Ð°Ð½Ð¸Ñ"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ñ‚ÑÑ Ñ‡ÐµÑ€ÐµÐ· ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½ÑƒÑŽ Ð¿Ð¾Ñ‡Ñ‚Ñƒ:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "ÐÐ¸ Ð¾Ð´Ð¸Ð½ Ñ‡ÐµÐ»Ð¾Ð²ÐµÐº Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ÐžÐ±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "ÐžÐ±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº {item} Ñ {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶ÐµÑ‚ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Ð—Ð°Ñ‰Ð¸Ñ‰ÐµÐ½Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¼ÐµÐ½Ðµ ÑÑ€Ð¾ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ ÑÑ€Ð¾ÐºÐ° Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð»ÑÐµÑ‚ÑÑ ..."
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ "
@@ -452,87 +546,11 @@ msgstr "Ð¥Ð¾ÑÑ‚ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Ð¡Ñ€ÐµÐ´Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Ð¯Ð½Ð²Ð°Ñ€ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ÐœÐ°Ñ€Ñ‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "ÐÐ¿Ñ€ÐµÐ»ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "ÐœÐ°Ð¹"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Ð˜ÑŽÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Ð˜ÑŽÐ»ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "ÐÐ¾ÑÐ±Ñ€ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Ð¡ÐµÑ‚ÐµÐ²Ñ‹Ðµ ÑÐ»ÑƒÐ¶Ð±Ñ‹ Ð¿Ð¾Ð´ Ñ‚Ð²Ð¾Ð¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Ð’Ñ‹Ð¹Ñ‚Ð¸"
 
@@ -574,17 +592,3 @@ msgstr "ÑÐ»ÐµÐ´"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "ÐŸÑ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ð¸Ñ‚ÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÐ¸Ð¸ %s. ÐÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ ÑÐ²Ð¾Ð¹ â€‹â€‹Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. <br/>ÐŸÐ¾ ÑÐ¾Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑÐ¼ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸, Ð’Ð°Ð¼ Ð¸Ð½Ð¾Ð³Ð´Ð° Ð¿Ñ€Ð¸Ð´ÐµÑ‚ÑÑ Ð²Ð²Ð¾Ð´Ð¸Ñ‚ÑŒ ÑÐ²Ð¾Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÑÐ½Ð¾Ð²Ð°."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ÐŸÐ¾Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚ÑŒ"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index aaa96b72d90efbb1bf37e1e9b06705fc54038111..0c617eada2f1da4cb6368f0cdcc7467b16ee4127 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 11:53+0000\n"
-"Last-Translator: adol <sharov3@gmail.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -42,46 +42,46 @@ msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑ€ÐµÐ¼ÐµÑÑ‚Ð¸Ñ‚ÑŒ %s"
 msgid "Unable to rename file"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿ÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½. ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Ð¤Ð°Ð¹Ð» ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Ð¤Ð°Ð¹Ð» Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ Ñ€Ð°Ð·Ð¼ÐµÑ€ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ‹Ð¹ upload_max_filesize Ð² php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ð¤Ð°Ð¹Ð» Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ Ñ€Ð°Ð·Ð¼ÐµÑ€ MAX_FILE_SIZE, ÑƒÐºÐ°Ð·Ð°Ð½Ñ‹Ð¹ Ð² HTML-Ñ„Ð¾Ñ€Ð¼Ðµ"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ð¤Ð°Ð¹Ð» Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½ Ð½Ðµ Ð¿Ð¾Ð»Ð½Ð¾ÑÑ‚ÑŒÑŽ"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð½Ð°Ð¹Ñ‚Ð¸ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½ÑƒÑŽ Ð¿Ð°Ð¿ÐºÑƒ"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð½Ð° Ð´Ð¸ÑÐº"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ‚Ð¾Ñ‡Ð½Ð¾ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑ‚Ð°"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³."
 
@@ -89,11 +89,11 @@ msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ñ‹Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³."
 msgid "Files"
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ°Ñ†Ð¸ÑŽ"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
@@ -101,137 +101,151 @@ msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 msgid "Rename"
 msgstr "ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾ {new_name} Ð½Ð° {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "Ð½Ðµ Ð¾Ð¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð½Ñ‹Ðµ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "ÑƒÐ´Ð°Ð»ÐµÐ½Ð½Ñ‹Ðµ {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' - Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð¸Ð¼Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' Ð¸ '*' Ð½ÐµÐ´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ðµ ZIP-Ñ„Ð°Ð¹Ð»Ð°, ÑÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr ""
 
-#: js/files.js:224
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr ""
+
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ÐÐµ ÑƒÐ´Ð°ÐµÑ‚ÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð» Ñ€Ð°Ð·Ð¼ÐµÑ€Ð¾Ð¼ 0 Ð±Ð°Ð¹Ñ‚ Ð² ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ÐžÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ 1 Ñ„Ð°Ð¹Ð»"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÑ‚ÑÑ"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ð¤Ð°Ð¹Ð» Ð² Ð¿Ñ€Ð¾Ñ†ÐµÑÑÐµ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸. ÐŸÐ¾ÐºÐ¸Ð½ÑƒÐ² ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ Ð²Ñ‹ Ð¿Ñ€ÐµÑ€Ð²Ñ‘Ñ‚Ðµ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÑƒ."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Ð¡ÑÑ‹Ð»ÐºÐ° Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ð¾Ð¹."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ÐÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾Ðµ Ð¸Ð¼Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°. Ð˜Ð¼Ñ 'Shared' Ð·Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾."
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¿Ñ€Ð¾ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²Ñ€ÐµÐ¼Ñ ÑÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½Ñ‘Ð½"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} Ð¿Ð°Ð¿Ð¾Ðº"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 Ñ„Ð°Ð¹Ð»"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸"
@@ -280,36 +294,32 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "Ð˜Ð· ÑÑÑ‹Ð»ÐºÐ¸"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚. Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Ð¡ÐºÐ°Ñ‡Ð°Ñ‚ÑŒ"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ð¹Ð» ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð’Ñ‹ Ð¿Ñ‹Ñ‚Ð°ÐµÑ‚ÐµÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ, Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÑŽÑ‚ Ð»Ð¸Ð¼Ð¸Ñ‚ Ð´Ð»Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð½Ð° ÑÑ‚Ð¾Ð¼ ÑÐµÑ€Ð²ÐµÑ€Ðµ."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "ÐŸÐ¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ, Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐºÐ°Ð½Ð¸Ñ€ÑƒÑŽÑ‚ÑÑ."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Ð¢ÐµÐºÑƒÑ‰ÐµÐµ ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 5ae5f4852239733d8b3d0d8bf51e779bfe3b4fe6..9a2315aa144c6c65bb498c2ab10dd67ad60e8444 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -8,28 +8,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 07:47+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ð˜ÑÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ñ… Ñ‚Ð¸Ð¿Ð¾Ð² Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "ÐÐ¸Ñ‡ÐµÐ³Ð¾"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index bb622c0e095fa318dd7696201b9d108886332235..e25aa41375aeaeffd3ec645f9f7751a1277f652d 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/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: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 13:09+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
@@ -20,22 +20,10 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "ÐŸÑ€Ð¾ÑÑ€Ð¾Ñ‡Ð¸Ñ‚ÑŒ Ð²ÑÐµ Ð²ÐµÑ€ÑÐ¸Ð¸"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "ÐžÑ‡Ð¸ÑÑ‚Ð¸Ñ‚ÑŒ ÑÐ¿Ð¸ÑÐ¾Ðº Ð²ÐµÑ€ÑÐ¸Ð¹ Ð²Ð°ÑˆÐ¸Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð²"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index a031a62f802e0bd7e30085ed60b927cb71a1cfb5..3426bc617228b2450e96edff874d2797f698344a 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-22 00:01+0100\n"
-"PO-Revision-Date: 2012-11-21 12:19+0000\n"
-"Last-Translator: Mihail Vasiliev <mickvav@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,51 +22,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Ð›Ð¸Ñ‡Ð½Ð¾Ðµ"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP-ÑÐºÐ°Ñ‡Ð¸Ð²Ð°Ð½Ð¸Ðµ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð¿Ð¾ Ð¾Ð´Ð½Ð¾Ð¼Ñƒ."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼"
 
-#: files.php:386
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
 
@@ -86,55 +90,55 @@ msgstr "Ð¢ÐµÐºÑÑ‚"
 msgid "Images"
 msgstr "Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Ð¼ÐµÐ½ÐµÐµ Ð¼Ð¸Ð½ÑƒÑ‚Ñ‹"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ÑÐµÐ³Ð¾Ð´Ð½Ñ"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ð³Ð¾Ð´Ñ‹ Ð½Ð°Ð·Ð°Ð´"
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e3155d76a8a1dbd269f46e2e414738320af0c8fd..23d54be85fdbf21fd80ab833d21748128d75fd5a 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.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-01-13 00:08+0100\n"
-"PO-Revision-Date: 2013-01-12 11:55+0000\n"
-"Last-Translator: adol <sharov3@gmail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -99,7 +99,7 @@ msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 msgid "Saving..."
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Ð ÑƒÑÑÐºÐ¸Ð¹ "
 
@@ -111,15 +111,15 @@ msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 msgid "More Apps"
 msgstr "Ð‘Ð¾Ð»ÑŒÑˆÐµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Ð’Ñ‹Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Ð¡Ð¼Ð¾Ñ‚Ñ€Ð¸Ñ‚Ðµ Ð´Ð¾Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð½Ð° apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span> Ð»Ð¸Ñ†ÐµÐ½Ð·Ð¸Ñ. ÐÐ²Ñ‚Ð¾Ñ€ <span class=\"author\"></span>"
 
@@ -168,7 +168,7 @@ msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Android-Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 msgid "Download iOS Client"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° iOS-Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
@@ -238,11 +238,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ð˜Ð¼Ñ"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
@@ -254,26 +254,30 @@ msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
 msgid "Default Storage"
 msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "ÐÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ð¾"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Ð”Ñ€ÑƒÐ³Ð¾Ðµ"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñ‹"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "ÐŸÐ¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 5ab21a67d524b5f2dbd841321ec0d1d81ab9eb97..383f6bb2909218f330c72fed544843837e10d7ea 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/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: 2012-12-16 00:11+0100\n"
-"PO-Revision-Date: 2012-12-15 01:57+0000\n"
-"Last-Translator: sam002 <semen@sam002.net>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:19+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,9 +29,9 @@ msgstr "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b>ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap Ð¸ user_webdavaut
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Ð’Ð½Ð¸Ð¼Ð°Ð½Ð¸Ðµ:</b> ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¹ PHP LDAP Ð¼Ð¾Ð´ÑƒÐ»ÑŒ Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ð¹ Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾."
+"<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 "Host"
@@ -46,6 +46,10 @@ msgstr "ÐœÐ¾Ð¶Ð½Ð¾ Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», Ð·Ð° Ð¸ÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ
 msgid "Base DN"
 msgstr "Ð‘Ð°Ð·Ð¾Ð²Ñ‹Ð¹ DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð´Ð°Ñ‚ÑŒ Base DN Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿ Ð½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐµ \"Ð Ð°ÑÑˆÐ¸Ñ€ÐµÐ½Ð½Ð¾Ðµ\""
@@ -117,10 +121,18 @@ msgstr "ÐŸÐ¾Ñ€Ñ‚"
 msgid "Base User Tree"
 msgstr "Ð‘Ð°Ð·Ð° Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¾Ð³Ð¾ Ð´ÐµÑ€ÐµÐ²Ð°"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Ð‘Ð°Ð·Ð° Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ð³Ð¾ Ð´ÐµÑ€ÐµÐ²Ð°"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "ÐÑÑÐ¾Ñ†Ð¸Ð°Ñ†Ð¸Ñ Ð“Ñ€ÑƒÐ¿Ð¿Ð°-Ð£Ñ‡Ð°ÑÑ‚Ð½Ð¸Ðº"
diff --git a/l10n/ru/user_webdavauth.po b/l10n/ru/user_webdavauth.po
index 12e0350b3284b296eb24b4c8bbb41f1e717bf150..709cb4a65dc39858cc476e4a17854bb7822c9170 100644
--- a/l10n/ru/user_webdavauth.po
+++ b/l10n/ru/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-27 00:04+0100\n"
-"PO-Revision-Date: 2012-12-26 06:19+0000\n"
-"Last-Translator: adol <sharov3@gmail.com>\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/ru_RU/core.po b/l10n/ru_RU/core.po
index a785898d1c27d63d00a8b6eda83875a3da787b3d..ad1e6dddba8f1f041056c5f383a411379d8c7d06 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <cdewqazxsqwe@gmail.com>, 2013.
 #   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +19,24 @@ 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/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð’Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ñ„Ð°Ð¹Ð»Ñƒ"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ %s Ð¾Ñ‚ÐºÑ€Ñ‹Ð» Ð’Ð°Ð¼ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ðº Ð¿Ð°Ð¿ÐºÐµ"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +81,135 @@ msgstr "ÐÐµÑ‚ ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ð¹, Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ñ… Ð´Ð»Ñ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ."
 msgid "Error removing %s from favorites."
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ %s Ð¸Ð· Ð¸Ð·Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Ð¡Ñ€ÐµÐ´Ð°"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Ð¯Ð½Ð²Ð°Ñ€ÑŒ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ÐœÐ°Ñ€Ñ‚"
+
+#: js/config.php:33
+msgid "April"
+msgstr "ÐÐ¿Ñ€ÐµÐ»ÑŒ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "ÐœÐ°Ð¹"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Ð˜ÑŽÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Ð˜ÑŽÐ»ÑŒ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ"
+
+#: js/config.php:33
+msgid "October"
+msgstr "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ"
+
+#: js/config.php:33
+msgid "November"
+msgstr "ÐÐ¾ÑÐ±Ñ€ÑŒ"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr " 1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{Ð¼Ð¸Ð½ÑƒÑ‚Ñ‹} Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{Ñ‡Ð°ÑÑ‹} Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ÑÐµÐ³Ð¾Ð´Ð½Ñ"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{Ð´Ð½Ð¸} Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{Ð¼ÐµÑÑÑ†Ñ‹} Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Ð¼ÐµÑÑÑ† Ð½Ð°Ð·Ð°Ð´"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ð»ÐµÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
@@ -162,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ°"
 
@@ -175,123 +252,141 @@ msgstr "Ð˜Ð¼Ñ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð½Ðµ ÑƒÐºÐ°Ð·Ð°Ð½Ð¾."
 msgid "The required file {file} is not installed!"
 msgstr "Ð¢Ñ€ÐµÐ±ÑƒÐµÐ¼Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» {Ñ„Ð°Ð¹Ð»} Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ³Ð¾ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¸ Ð¿Ñ€Ð°Ð² Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ Ð’Ð°Ñ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ {Ð³Ñ€ÑƒÐ¿Ð¿Ð°} {ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½Ð¸Ðº}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð¾ Ð´Ð»Ñ Ð’Ð°Ñ {ÑÐ¾Ð±ÑÑ‚Ð²ÐµÐ½Ð½Ð¸Ðº}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¼ Ñ"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ñ‚ÑŒ Ñ ÑÑÑ‹Ð»ÐºÐ¾Ð¹"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Ð—Ð°Ñ‰Ð¸Ñ‚Ð¸Ñ‚ÑŒ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Ð¡ÑÑ‹Ð»ÐºÐ° Ð½Ð° Ð°Ð´Ñ€ÐµÑ ÑÐ»ÐµÐºÑ‚Ñ€Ð¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾Ñ‡Ñ‚Ñ‹"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Ð£ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÑÑ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚Ð° Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ ÑÑ€Ð¾ÐºÐ° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Ð¡Ð´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰ÐµÐ´Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ð¼ Ð¿Ð¾ÑÑ€ÐµÐ´ÑÑ‚Ð²Ð¾Ð¼ email:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "ÐÐµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð»ÑŽÐ´ÐµÐ¹"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Ð ÐµÐºÑƒÑ€ÑÐ¸Ð²Ð½Ñ‹Ð¹ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿ Ð½Ðµ Ñ€Ð°Ð·Ñ€ÐµÑˆÐµÐ½"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Ð¡Ð¾Ð²Ð¼ÐµÑÑ‚Ð½Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð² {Ð¾Ð±ÑŠÐµÐºÑ‚} Ñ {Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒ}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "ÐžÑ‚ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¹ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "ÑÐ¾Ð·Ð´Ð°Ñ‚ÑŒ"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "ÑÐ´ÐµÐ»Ð°Ñ‚ÑŒ Ð¾Ð±Ñ‰Ð¸Ð¼"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ Ð·Ð°Ñ‰Ð¸Ñ‰ÐµÐ½"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¸ Ð´Ð°Ñ‚Ñ‹ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ ÑÑ€Ð¾ÐºÐ° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÐµ Ð´Ð°Ñ‚Ñ‹ Ð¸ÑÑ‚ÐµÑ‡ÐµÐ½Ð¸Ñ ÑÑ€Ð¾ÐºÐ° Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "ÐžÑ‚Ð¿Ñ€Ð°Ð²ÐºÐ° ..."
 
-#: js/share.js:592
+#: js/share.js:609
 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 "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, ÑÐ¾Ð¾Ð±Ñ‰Ð¸Ñ‚Ðµ Ð¾Ð± ÑÑ‚Ð¾Ð¼ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ðµ Ð² <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 "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿Ñ€Ð¾ÑˆÐ»Ð¾ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾. ÐÐµÐ¼ÐµÐ´Ð»ÐµÐ½Ð½Ð¾Ðµ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð’Ð°Ñ Ð½Ð° ownCloud."
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ÐŸÐµÑ€ÐµÐ½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ Ð¿Ð°Ñ€Ð¾Ð»Ñ"
@@ -443,87 +538,11 @@ msgstr "Ð¡ÐµÑ€Ð²ÐµÑ€ Ð±Ð°Ð·Ñ‹ Ð´Ð°Ð½Ð½Ñ‹Ñ…"
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ðµ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Ð’Ð¾ÑÐºÑ€ÐµÑÐµÐ½ÑŒÐµ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÐ»ÑŒÐ½Ð¸Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Ð’Ñ‚Ð¾Ñ€Ð½Ð¸Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Ð¡Ñ€ÐµÐ´Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€Ð³"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "ÐŸÑÑ‚Ð½Ð¸Ñ†Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Ð¡ÑƒÐ±Ð±Ð¾Ñ‚Ð°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Ð¯Ð½Ð²Ð°Ñ€ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Ð¤ÐµÐ²Ñ€Ð°Ð»ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ÐœÐ°Ñ€Ñ‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "ÐÐ¿Ñ€ÐµÐ»ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "ÐœÐ°Ð¹"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Ð˜ÑŽÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Ð˜ÑŽÐ»ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Ð¡ÐµÐ½Ñ‚ÑÐ±Ñ€ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "ÐžÐºÑ‚ÑÐ±Ñ€ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "ÐÐ¾ÑÐ±Ñ€ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Ð”ÐµÐºÐ°Ð±Ñ€ÑŒ"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ð¸ÑÑ‹ Ð¿Ð¾Ð´ Ð’Ð°ÑˆÐ¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Ð’Ñ‹Ð¹Ñ‚Ð¸"
 
@@ -564,18 +583,4 @@ msgstr "ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ð¹"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ¸ÑÑ‚ÐµÐ¼Ñ‹ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ñ€Ð¾Ð²ÐµÑ€ÑŒÑ‚Ðµ ÑÐ²Ð¾Ð¹ â€‹â€‹Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. <br/>ÐŸÐ¾ ÑÐ¾Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸ÑÐ¼ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑ‚Ð¸ Ð’Ð°Ð¼ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¸Ð½Ð¾Ð³Ð´Ð° Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¾ Ð²Ð²ÐµÑÑ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ ÐµÑ‰Ðµ Ñ€Ð°Ð·."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ÐŸÑ€Ð¾Ð²ÐµÑ€Ð¸Ñ‚ÑŒ"
+msgstr "ÐžÐ±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ðµ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÐ¸Ð¸ %s, ÑÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ."
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 5c40bd57bd1d97bd234f588f2730a3e60712409f..00422df23bf2bcc5d5bb361bd20243484219253a 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½. ÐÐµÐ¸Ð·Ð²ÐµÑÑ‚Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð¾Ñ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚, Ñ„Ð°Ð¹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ð·Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÐ¼Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ð° Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ upload_max_filesize Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ñƒ Ð² php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð½Ð¾Ð³Ð¾"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ¶Ð°ÐµÐ¼Ñ‹Ð¹ Ñ„Ð°Ð¹Ð» Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½ Ñ‡Ð°ÑÑ‚Ð¸Ñ‡Ð½Ð¾"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ð¤Ð°Ð¹Ð» Ð½Ðµ Ð±Ñ‹Ð» Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ Ð²Ñ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ÐÐµ ÑƒÐ´Ð°Ð»Ð¾ÑÑŒ Ð·Ð°Ð¿Ð¸ÑÐ°Ñ‚ÑŒ Ð½Ð° Ð´Ð¸ÑÐº"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Files"
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Ð¡ÐºÑ€Ñ‹Ñ‚ÑŒ"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 
@@ -92,137 +92,151 @@ msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 msgid "Rename"
 msgstr "ÐŸÐµÑ€ÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ñ‚ÑŒ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{Ð½Ð¾Ð²Ð¾Ðµ_Ð¸Ð¼Ñ} ÑƒÐ¶Ðµ ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÐµÑ‚"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð°"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Ð¿Ð¾Ð´Ð¾Ð±Ñ€Ð°Ñ‚ÑŒ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾ {Ð½Ð¾Ð²Ð¾Ðµ_Ð¸Ð¼Ñ}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ðµ"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÐ½ÐµÐ½Ð¾ {Ð½Ð¾Ð²Ð¾Ðµ_Ð¸Ð¼Ñ} Ñ {ÑÑ‚Ð°Ñ€Ð¾Ðµ_Ð¸Ð¼Ñ}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "CÐ¾Ð²Ð¼ÐµÑÑ‚Ð½Ð¾Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ñ€ÐµÐºÑ€Ð°Ñ‰ÐµÐ½Ð¾ {Ñ„Ð°Ð¹Ð»Ñ‹}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "ÑƒÐ´Ð°Ð»ÐµÐ½Ð¾ {Ñ„Ð°Ð¹Ð»Ñ‹}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ÐÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ðµ Ð¸Ð¼Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' Ð¸ '*' Ð½Ðµ Ð´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Ð¡Ð¾Ð·Ð´Ð°Ð½Ð¸Ðµ ZIP-Ñ„Ð°Ð¹Ð»Ð°, ÑÑ‚Ð¾ Ð¼Ð¾Ð¶ÐµÑ‚ Ð·Ð°Ð½ÑÑ‚ÑŒ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ð¾Ðµ Ð²Ñ€ÐµÐ¼Ñ."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ Ñ„Ð°Ð¹Ð»,\n Ñ‚Ð°Ðº ÐºÐ°Ðº Ð¾Ð½ Ð¸Ð¼ÐµÐµÑ‚ Ð½ÑƒÐ»ÐµÐ²Ð¾Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð¸Ð»Ð¸ ÑÐ²Ð»ÑÐµÑ‚ÑÑ Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸ÐµÐ¹"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Ð—Ð°ÐºÑ€Ñ‹Ñ‚ÑŒ"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ÐžÐ¶Ð¸Ð´Ð°ÑŽÑ‰Ð¸Ð¹ Ñ€ÐµÑˆÐµÐ½Ð¸Ñ"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° 1 Ñ„Ð°Ð¹Ð»Ð°"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ð¾ Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ÐŸÑ€Ð¾Ñ†ÐµÑÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ñ„Ð°Ð¹Ð»Ð°. Ð•ÑÐ»Ð¸ Ð¿Ð¾ÐºÐ¸Ð½ÑƒÑ‚ÑŒ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ ÑÐµÐ¹Ñ‡Ð°Ñ, Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð±ÑƒÐ´ÐµÑ‚ Ð¾Ñ‚Ð¼ÐµÐ½ÐµÐ½Ð°."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL Ð½Ðµ Ð´Ð¾Ð»Ð¶ÐµÐ½ Ð±Ñ‹Ñ‚ÑŒ Ð¿ÑƒÑÑ‚Ñ‹Ð¼."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¾Ñ‚ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¾"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Ð¾ÑˆÐ¸Ð±ÐºÐ° Ð¿Ñ€Ð¸ ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ð¸"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ð˜Ð¼Ñ"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ð¿Ð°Ð¿Ð¾Ðº"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 Ñ„Ð°Ð¹Ð»"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{ÐºÐ¾Ð»Ð¸Ñ‡ÐµÑÑ‚Ð²Ð¾} Ñ„Ð°Ð¹Ð»Ð¾Ð²"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ "
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Ð Ð°Ð±Ð¾Ñ‚Ð° Ñ Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸"
@@ -271,36 +285,32 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "ÐŸÐ¾ ÑÑÑ‹Ð»ÐºÐµ"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ "
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ÐžÑ‚Ð¼ÐµÐ½Ð° Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ð—Ð´ÐµÑÑŒ Ð½Ð¸Ñ‡ÐµÐ³Ð¾ Ð½ÐµÑ‚. Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ Ñ‡Ñ‚Ð¾-Ð½Ð¸Ð±ÑƒÐ´ÑŒ!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ°"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð Ð°Ð·Ð¼ÐµÑ€ Ñ„Ð°Ð¹Ð»Ð¾Ð², ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð’Ñ‹ Ð¿Ñ‹Ñ‚Ð°ÐµÑ‚ÐµÑÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ, Ð¿Ñ€ÐµÐ²Ñ‹ÑˆÐ°ÐµÑ‚ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¾ Ð´Ð¾Ð¿ÑƒÑÑ‚Ð¸Ð¼Ñ‹Ð¹ Ñ€Ð°Ð·Ð¼ÐµÑ€ Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð½Ð° Ð´Ð°Ð½Ð½Ñ‹Ð¹ ÑÐµÑ€Ð²ÐµÑ€."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ ÑÐºÐ°Ð½Ð¸Ñ€ÑƒÑŽÑ‚ÑÑ, Ð¿Ð¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿Ð¾Ð´Ð¾Ð¶Ð´Ð¸Ñ‚Ðµ."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Ð¢ÐµÐºÑƒÑ‰ÐµÐµ ÑÐºÐ°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
diff --git a/l10n/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
index 11a617011411a2a7b1227243f1f8960cfb4219f2..b27f0a2def2724c93fcf248f082c096915c2162f 100644
--- a/l10n/ru_RU/files_encryption.po
+++ b/l10n/ru_RU/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-20 02:05+0200\n"
-"PO-Revision-Date: 2012-09-19 12:14+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Ð˜ÑÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ðµ ÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð¸Ðµ Ñ‚Ð¸Ð¿Ñ‹ Ñ„Ð°Ð¹Ð»Ð¾Ð² Ð¸Ð· ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "ÐÐ¸ Ð¾Ð´Ð¸Ð½"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°Ð½Ð¸Ðµ"
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index 241dfcc0e912ce1a744c3c93879ec050a18f74e7..440d5bbecb080d2d6c30f7fe5ed7d0b76082fc29 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/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: 2012-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 07:25+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Ð¡Ñ€Ð¾Ðº Ð´ÐµÐ¹ÑÑ‚Ð²Ð¸Ñ Ð²ÑÐµÑ… Ð²ÐµÑ€ÑÐ¸Ð¹ Ð¸ÑÑ‚ÐµÐºÐ°ÐµÑ‚"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Ð˜ÑÑ‚Ð¾Ñ€Ð¸Ñ"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÐ¸Ð¸"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "ÐÑ‚Ð¾ Ð¿Ñ€Ð¸Ð²ÐµÐ´ÐµÑ‚ Ðº ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸ÑŽ Ð²ÑÐµÑ… ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ñ… Ð²ÐµÑ€ÑÐ¸Ð¹ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ð¾Ð¹ ÐºÐ¾Ð¿Ð¸Ð¸ Ð’Ð°ÑˆÐ¸Ñ… Ñ„Ð°Ð¹Ð»Ð¾Ð²"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð²ÐµÑ€ÑÐ¸ÑÐ¼Ð¸"
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 5ca45d27ad239861ca080a5218bcd773c2fa13b7..34e58324fbddb64f551404e201999e8f59452688 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <cdewqazxsqwe@gmail.com>, 2013.
 #   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 09:27+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 10:41+0000\n"
 "Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -18,51 +19,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "ÐŸÐ¾Ð¼Ð¾Ñ‰ÑŒ"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "ÐŸÐµÑ€ÑÐ¾Ð½Ð°Ð»ÑŒÐ½Ñ‹Ð¹"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ¸"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "ÐŸÐ¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ð¸"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° ZIP Ð²Ñ‹ÐºÐ»ÑŽÑ‡ÐµÐ½Ð°."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð¾Ð´Ð¸Ð½ Ð·Ð° Ð´Ñ€ÑƒÐ³Ð¸Ð¼."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð¾ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ¸ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ zip-Ð°Ñ€Ñ…Ð¸Ð²Ð°."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¾"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "ÐžÑˆÐ¸Ð±ÐºÐ° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸"
 
@@ -82,55 +87,55 @@ msgstr "Ð¢ÐµÐºÑÑ‚"
 msgid "Images"
 msgstr "Ð˜Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "ÑÐµÐºÑƒÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 Ð¼Ð¸Ð½ÑƒÑ‚Ñƒ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d Ð¼Ð¸Ð½ÑƒÑ‚ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 Ñ‡Ð°Ñ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d Ñ‡Ð°ÑÐ¾Ð² Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ÑÐµÐ³Ð¾Ð´Ð½Ñ"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ð²Ñ‡ÐµÑ€Ð°"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d Ð´Ð½ÐµÐ¹ Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð¼ÐµÑÑÑ†Ðµ"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d Ð¼ÐµÑÑÑ†ÐµÐ² Ð½Ð°Ð·Ð°Ð´"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ð² Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð¼ Ð³Ð¾Ð´Ñƒ"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ð³Ð¾Ð´ Ð½Ð°Ð·Ð°Ð´"
 
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index bf961ac7a007b98ebe01f4e25ea20498c71b1e90..8722c9ae9554a4c4be371a06b080ca9e83009954 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <cdewqazxsqwe@gmail.com>, 2013.
 #   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+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"
@@ -88,7 +89,7 @@ msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ"
 msgid "Saving..."
 msgstr "Ð¡Ð¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ðµ"
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__ÑÐ·Ñ‹Ðº_Ð¸Ð¼Ñ__"
 
@@ -100,15 +101,15 @@ msgstr "Ð”Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ Ð’Ð°ÑˆÐµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 msgid "More Apps"
 msgstr "Ð‘Ð¾Ð»ÑŒÑˆÐµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Ð’Ñ‹Ð±Ñ€Ð°Ñ‚ÑŒ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "ÐžÐ±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ðµ Ð¿Ñ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹ Ð½Ð° apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
@@ -147,7 +148,7 @@ msgstr "ÐšÐ»Ð¸ÐµÐ½Ñ‚Ñ‹"
 
 #: templates/personal.php:13
 msgid "Download Desktop Clients"
-msgstr ""
+msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð´ÐµÑÐºÑ‚Ð¾Ð¿Ð½Ñ‹Ñ… ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð²"
 
 #: templates/personal.php:14
 msgid "Download Android Client"
@@ -157,7 +158,7 @@ msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚ Ð¿Ð¾Ð´ Android "
 msgid "Download iOS Client"
 msgstr "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚ Ð¿Ð¾Ð´ iOS "
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
@@ -227,11 +228,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ð˜Ð¼Ñ"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹"
 
@@ -241,28 +242,32 @@ msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "ÐÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ñ‹Ð¹"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Ð”Ñ€ÑƒÐ³Ð¾Ð¹"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Admin"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index 4a514279ab3639ed66c32f84920ad35d2f381825..cd5c6be4905ff93420356ff575578dca59bd5369 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#  <cdewqazxsqwe@gmail.com>, 2013.
 #   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 08:59+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 10:56+0000\n"
 "Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -27,9 +28,9 @@ msgstr "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ:</b> ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ user_ldap Ð¸ u
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ:</b> ÐÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¹ PHP LDAP-Ð¼Ð¾Ð´ÑƒÐ»ÑŒ Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, backend Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>ÐŸÑ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ:</b> ÐœÐ¾Ð´ÑƒÐ»ÑŒ PHP LDAP Ð½Ðµ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½, Ð±ÑÐºÑÐ½Ð´ Ð½Ðµ Ð±ÑƒÐ´ÐµÑ‚ Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ñ‚ÑŒ. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¾Ð±Ñ€Ð°Ñ‚Ð¸Ñ‚ÐµÑÑŒ Ðº Ð’Ð°ÑˆÐµÐ¼Ñƒ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð¼Ñƒ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ñƒ, Ñ‡Ñ‚Ð¾Ð±Ñ‹ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ ÐµÐ³Ð¾."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -44,6 +45,10 @@ msgstr "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð¿Ñ€Ð¾Ð¿ÑƒÑÑ‚Ð¸Ñ‚ÑŒ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», ÐµÑÐ»Ð¸ Ð’Ð°Ð¼
 msgid "Base DN"
 msgstr "Ð‘Ð°Ð·Ð° DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "ÐžÐ´Ð½Ð¾ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ"
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ð’Ñ‹ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð´Ð°Ñ‚ÑŒ Base DN Ð´Ð»Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹ Ð¸ Ð³Ñ€ÑƒÐ¿Ð¿ Ð²Ð¾ Ð²ÐºÐ»Ð°Ð´ÐºÐµ Â«Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Â»"
@@ -115,10 +120,18 @@ msgstr "ÐŸÐ¾Ñ€Ñ‚"
 msgid "Base User Tree"
 msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð¾Ðµ Ð´ÐµÑ€ÐµÐ²Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÐµÐ¹"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "ÐžÐ´Ð½Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑÐºÐ¾Ðµ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð¾Ðµ Ð´ÐµÑ€ÐµÐ²Ð¾ Ð³Ñ€ÑƒÐ¿Ð¿"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "ÐžÐ´Ð½Ð¾ Ð³Ñ€ÑƒÐ¿Ð¿Ð¾Ð²Ð¾Ðµ Ð±Ð°Ð·Ð¾Ð²Ð¾Ðµ DN Ð½Ð° Ð»Ð¸Ð½Ð¸ÑŽ"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Ð¡Ð²ÑÐ·ÑŒ Ñ‡Ð»ÐµÐ½-Ð³Ñ€ÑƒÐ¿Ð¿Ð°"
diff --git a/l10n/ru_RU/user_webdavauth.po b/l10n/ru_RU/user_webdavauth.po
index 5308dbe4c2dc59794472254cf3ef368cf47a3fde..a14bb9d28edab1828ae2cdaff7cf4738e2c82a65 100644
--- a/l10n/ru_RU/user_webdavauth.po
+++ b/l10n/ru_RU/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-21 00:10+0100\n"
-"PO-Revision-Date: 2012-12-20 06:57+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\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"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: ru_RU\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/si_LK/core.po b/l10n/si_LK/core.po
index 349d4486cc405bdce1c2f9cbeb6dc1f7c20d28f7..0d0fd472df8b36fc8f812c1db8a757e3f3ac6496 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +82,135 @@ msgstr "à¶¸à¶šà· à¶¯à·à¶¸à·“à¶¸ à·ƒà¶³à·„à· à¶´à·Šâ€à¶»à·€à¶»à·Šà¶œà¶ºà¶±à·Š
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "à¶‰à¶»à·’à¶¯à·"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "à·ƒà¶³à·”à¶¯à·"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "à¶…à¶Ÿà·„à¶»à·”à·€à·à¶¯à·"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "à¶¶à¶¯à·à¶¯à·"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "à¶¶à·Šâ€à¶»à·„à·ƒà·Šà¶´à¶à·’à¶±à·Šà¶¯à·"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "à·ƒà·’à¶šà·”à¶»à·à¶¯à·"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "à·ƒà·™à¶±à·ƒà·”à¶»à·à¶¯à·"
+
+#: js/config.php:33
+msgid "January"
+msgstr "à¶¢à¶±à·€à·à¶»à·’"
+
+#: js/config.php:33
+msgid "February"
+msgstr "à¶´à·™à¶¶à¶»à·€à·à¶»à·’"
+
+#: js/config.php:33
+msgid "March"
+msgstr "à¶¸à·à¶»à·Šà¶à·”"
+
+#: js/config.php:33
+msgid "April"
+msgstr "à¶…à¶´à·Šâ€à¶»à·šà¶½à·Š"
+
+#: js/config.php:33
+msgid "May"
+msgstr "à¶¸à·à¶ºà·’"
+
+#: js/config.php:33
+msgid "June"
+msgstr "à¶¢à·–à¶±à·’"
+
+#: js/config.php:33
+msgid "July"
+msgstr "à¶¢à·–à¶½à·’"
+
+#: js/config.php:33
+msgid "August"
+msgstr "à¶…à¶œà·à·ƒà·Šà¶à·”"
+
+#: js/config.php:33
+msgid "September"
+msgstr "à·ƒà·à¶´à·Šà¶à·à¶¸à·Šà¶¶à¶»à·Š"
+
+#: js/config.php:33
+msgid "October"
+msgstr "à¶”à¶šà·Šà¶à·à¶¶à¶»à·Š"
+
+#: js/config.php:33
+msgid "November"
+msgstr "à¶±à·œà·€à·à¶¸à·Šà¶¶à¶»à·Š"
+
+#: js/config.php:33
+msgid "December"
+msgstr "à¶¯à·™à·ƒà·à¶¸à·Šà¶¶à¶»à·Š"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "à·ƒà·à¶šà·ƒà·”à¶¸à·Š"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ à¶´à·™à¶»"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶šà¶§ à¶´à·™à¶»"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "à¶…à¶¯"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "à¶Šà¶ºà·š"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "à¶´à·™à¶» à¶¸à·à·ƒà¶ºà·š"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "à¶¸à·à·ƒ à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "à¶´à·™à¶» à¶…à·€à·”à¶»à·”à¶¯à·Šà¶¯à·š"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "à¶…à·€à·”à¶»à·”à¶¯à·” à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 
@@ -164,8 +240,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "à¶¯à·à·‚à¶ºà¶šà·Š"
 
@@ -177,123 +253,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "à¶ºà·œà¶¸à·”à·€à¶šà·Š à¶¸à¶Ÿà·’à¶±à·Š à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶ºà¶šà·’à¶±à·Š à¶†à¶»à¶šà·Šà·à·à¶šà¶»à¶±à·Šà¶±"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶º "
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à·€à·’à¶¸à·š à¶¯à·’à¶±à¶º à¶¯à¶¸à¶±à·Šà¶±"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à·€à·’à¶¸à·š à¶¯à·’à¶±à¶º"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "à·€à·’à¶¯à·Šâ€à¶ºà·”à¶à·Š à¶à·à¶´à·‘à¶½ à¶¸à¶Ÿà·’à¶±à·Š à¶¶à·™à¶¯à·à¶œà¶±à·Šà¶±: "
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "à¶±à·œà¶¶à·™à¶¯à·”"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "à·ƒà¶‚à·ƒà·Šà¶šà¶»à¶«à¶º à¶šà·… à·„à·à¶š"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "à¶´à·Šâ€à¶»à·€à·šà· à¶´à·à¶½à¶±à¶º"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "à·ƒà¶¯à¶±à·Šà¶±"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "à¶ºà·à·€à¶à·Šà¶šà·à¶½à·“à¶± à¶šà¶»à¶±à·Šà¶±"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "à¶¸à¶šà¶±à·Šà¶±"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "à¶¶à·™à¶¯à·à·„à¶¯à·à¶œà¶±à·Šà¶±"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "à¶¸à·”à¶» à¶´à¶¯à¶ºà¶šà·’à¶±à·Š à¶†à¶»à¶šà·Šà·à·à¶šà¶» à¶‡à¶"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à¶¯à·’à¶±à¶º à¶‰à·€à¶à·Š à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "à¶šà¶½à·Š à¶‰à¶šà·”à¶à·Š à¶¯à·’à¶±à¶º à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud à¶¸à·”à¶»à¶´à¶¯à¶º à¶´à·Šâ€à¶»à¶à·Šâ€à¶ºà·à¶»à¶¸à·Šà¶· à¶šà¶»à¶±à·Šà¶±"
@@ -445,87 +539,11 @@ msgstr "à¶¯à¶à·Šà¶à¶œà¶¶à¶©à· à·ƒà·šà·€à·à¶¯à·à¶ºà¶šà¶ºà·"
 msgid "Finish setup"
 msgstr "à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸ à¶…à·€à·ƒà¶±à·Š à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "à¶‰à¶»à·’à¶¯à·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "à·ƒà¶³à·”à¶¯à·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "à¶…à¶Ÿà·„à¶»à·”à·€à·à¶¯à·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "à¶¶à¶¯à·à¶¯à·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "à¶¶à·Šâ€à¶»à·„à·ƒà·Šà¶´à¶à·’à¶±à·Šà¶¯à·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "à·ƒà·’à¶šà·”à¶»à·à¶¯à·"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "à·ƒà·™à¶±à·ƒà·”à¶»à·à¶¯à·"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "à¶¢à¶±à·€à·à¶»à·’"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "à¶´à·™à¶¶à¶»à·€à·à¶»à·’"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "à¶¸à·à¶»à·Šà¶à·”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "à¶…à¶´à·Šâ€à¶»à·šà¶½à·Š"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "à¶¸à·à¶ºà·’"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "à¶¢à·–à¶±à·’"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "à¶¢à·–à¶½à·’"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "à¶…à¶œà·à·ƒà·Šà¶à·”"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "à·ƒà·à¶´à·Šà¶à·à¶¸à·Šà¶¶à¶»à·Š"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "à¶”à¶šà·Šà¶à·à¶¶à¶»à·Š"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "à¶±à·œà·€à·à¶¸à·Šà¶¶à¶»à·Š"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "à¶¯à·™à·ƒà·à¶¸à·Šà¶¶à¶»à·Š"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "à¶”à¶¶à¶§ à¶´à·à¶½à¶±à¶º à¶šà·… à·„à·à¶šà·’ à·€à·™à¶¶à·Š à·ƒà·šà·€à·à·€à¶±à·Š"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "à¶±à·’à¶šà·Šà¶¸à·“à¶¸"
 
@@ -567,17 +585,3 @@ msgstr "à¶Šà·…à¶Ÿ"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index b905772406b36b756892a985d72039e9f3d8b435..6f61a4f5cdf0574e553e08cb640f402bd187a7e9 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "à¶œà·œà¶±à·”à·€à¶šà·Š à¶‹à¶©à·”à¶œà¶ à¶±à·œà·€à·”à¶±à·’. à¶±à·œà·„à·à¶³à·’à¶±à·” à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "à¶±à·’à·€à·à¶»à¶¯à·’ à·€ à¶œà·œà¶±à·”à·€ à¶‹à¶©à·”à¶œà¶ à¶šà·™à¶»à·’à¶±à·’"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·… à¶œà·œà¶±à·”à·€à·š à·€à·’à·à·à¶½à¶à·Šà·€à¶º HTML à¶´à·à¶»à¶¸à¶ºà·š à¶±à·’à¶ºà¶¸ à¶šà·… à¶‡à¶à·’ MAX_FILE_SIZE à·€à·’à·à·à¶½à¶à·Šà·€à¶ºà¶§ à·€à¶©à· à·€à·à¶©à·’à¶º"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·… à¶œà·œà¶±à·”à·€à·š à¶šà·œà¶§à·ƒà¶šà·Š à¶´à¶¸à¶«à¶šà·Š à¶‹à¶©à·”à¶œà¶ à·€à·’à¶º"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "à¶šà·’à·ƒà·’à¶¯à·” à¶œà·œà¶±à·€à¶šà·Š à¶‹à¶©à·”à¶œà¶ à¶±à·œà·€à·’à¶±à·’"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "à¶à·à·€à¶šà·à¶½à·’à¶š à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š à·ƒà·œà¶ºà·à¶œà¶ à¶±à·œà·„à·à¶š"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "à¶à·à¶§à·’à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à·ƒà·à¶»à·Šà¶®à¶šà¶ºà·’"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Files"
 msgstr "à¶œà·œà¶±à·”"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "à¶±à·œà¶¶à·™à¶¯à·”"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "à¶¸à¶šà¶±à·Šà¶±"
 
@@ -92,137 +92,151 @@ msgstr "à¶¸à¶šà¶±à·Šà¶±"
 msgid "Rename"
 msgstr "à¶±à·à·€à¶ à¶±à¶¸à·Š à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "à¶´à·Šâ€à¶»à¶à·’à·ƒà·Šà¶®à·à¶´à¶±à¶º à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "à¶±à¶¸à¶šà·Š à¶ºà·à¶¢à¶±à· à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "à¶±à·’à·‚à·Šà¶´à·Šâ€à¶»à¶· à¶šà¶»à¶±à·Šà¶±"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·à¶ºà¶šà·Š"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "à·€à·ƒà¶±à·Šà¶±"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 à¶œà·œà¶±à·”à·€à¶šà·Š à¶‹à¶©à¶œà¶ à¶šà·™à¶»à·š"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶± à¶½à¶¯à·“"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "à¶‹à¶©à·”à¶œà¶à¶šà·’à¶»à·“à¶¸à¶šà·Š à·ƒà·’à¶¯à·”à·€à·š. à¶´à·’à¶§à·”à·€ à·„à·à¶» à¶ºà·à¶¸à·™à¶±à·Š à¶‘à¶º à¶±à·à·€à¶à·™à¶±à·” à¶‡à¶"
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "à¶ºà·œà¶¸à·”à·€ à·„à·’à·ƒà·Š à·€à·’à¶º à¶±à·œà·„à·à¶š"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "à¶´à¶»à·“à¶šà·Šà·‚à· à¶šà·’à¶»à·“à¶¸à·šà¶¯à·“ à¶¯à·à·‚à¶ºà¶šà·Š"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "à¶±à¶¸"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "à¶´à·Šâ€à¶»à¶¸à·à¶«à¶º"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "à·€à·™à¶±à·ƒà·Š à¶šà·…"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 à·†à·œà¶½à·Šà¶©à¶»à¶ºà¶šà·Š"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 à¶œà·œà¶±à·”à·€à¶šà·Š"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "à¶œà·œà¶±à·” à¶´à¶»à·’à·„à¶»à¶«à¶º"
@@ -271,36 +285,32 @@ msgstr "à·†à·à¶½à·Šà¶©à¶»à¶º"
 msgid "From link"
 msgstr "à¶ºà·œà¶¸à·”à·€à·™à¶±à·Š"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à¶…à¶à·Š à·„à¶»à·’à¶±à·Šà¶±"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "à¶¸à·™à·„à·’ à¶šà·’à·ƒà·’à·€à¶šà·Š à¶±à·œà¶¸à·à¶. à¶ºà¶¸à¶šà·Š à¶‹à¶©à·”à¶œà¶ à¶šà¶»à¶±à·Šà¶±"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "à¶¶à·à¶œà¶ à¶šà·’à¶»à·“à¶¸"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸ à·€à·’à·à·à¶½ à·€à·à¶©à·’à¶º"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "à¶”à¶¶ à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à¶§ à¶à·à¶à·Š à¶šà¶»à¶± à¶œà·œà¶±à·” à¶¸à·™à¶¸ à·ƒà·šà·€à·à¶¯à·à¶ºà¶šà¶ºà· à¶‹à¶©à·”à¶œà¶ à¶šà·’à¶»à·“à¶¸à¶§ à¶‰à¶©à¶¯à·“ à¶‡à¶à·’ à¶‹à¶´à¶»à·’à¶¸ à¶œà·œà¶±à·” à·€à·’à·à·à¶½à¶à·Šà·€à¶ºà¶§ à·€à¶©à· à·€à·à¶©à·’à¶º"
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "à¶œà·œà¶±à·” à¶´à¶»à·’à¶šà·Šà·‚à· à¶šà·™à¶»à·š. à¶¸à¶³à¶šà·Š à¶»à·à¶³à·“ à·ƒà·’à¶§à·’à¶±à·Šà¶±"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "à·€à¶»à·Šà¶à¶¸à·à¶± à¶´à¶»à·’à¶šà·Šà·‚à·à·€"
diff --git a/l10n/si_LK/files_encryption.po b/l10n/si_LK/files_encryption.po
index 7e40f2c3ea731e0a99b5251b4c96e4e7074f6071..8f8475ed5961f7c47563c6be75b3e44c66a1f453 100644
--- a/l10n/si_LK/files_encryption.po
+++ b/l10n/si_LK/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 11:00+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "à¶œà·”à¶´à·Šà¶ à¶šà·šà¶à¶±à¶º"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "à¶¸à·™à¶¸ à¶œà·œà¶±à·” à·€à¶»à·Šà¶œ à¶œà·”à¶´à·Šà¶ à¶šà·šà¶à¶±à¶º à¶šà·’à¶»à·“à¶¸à·™à¶±à·Š à¶¶à·à·„à·à¶»à·€ à¶à¶¶à¶±à·Šà¶±"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "à¶šà·’à·ƒà·’à·€à¶šà·Š à¶±à·à¶"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "à¶œà·”à¶´à·Šà¶ à¶šà·šà¶à¶±à¶º à·ƒà¶šà·Šâ€à¶»à·’à¶º à¶šà¶»à¶±à·Šà¶±"
diff --git a/l10n/si_LK/files_versions.po b/l10n/si_LK/files_versions.po
index 1d5285a2554d5682bf388f64af74856e6ef9dec6..65443ed184b8d7d55870ad761f4e07f8e32d9bb3 100644
--- a/l10n/si_LK/files_versions.po
+++ b/l10n/si_LK/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: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 10:27+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "à·ƒà·’à¶ºà¶½à·” à¶…à¶±à·”à·€à·à¶¯ à¶…à·€à¶½à¶‚à¶œà·” à¶šà¶»à¶±à·Šà¶±"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "à¶‰à¶à·’à·„à·à·ƒà¶º"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "à¶…à¶±à·”à·€à·à¶¯"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "à¶¸à·™à¶ºà·’à¶±à·Š à¶”à¶¶à¶œà·š à¶œà·œà¶±à·”à·€à·š à¶»à¶šà·Šà·à·’à¶ à¶šà¶»à¶±à·” à¶½à·à¶¶à·” à¶…à¶±à·”à·€à·à¶¯ à·ƒà·’à¶ºà¶½à·Šà¶½ à¶¸à¶šà· à¶¯à¶¸à¶±à·” à¶½à·à¶¶à·š"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "à¶œà·œà¶±à·” à¶…à¶±à·”à·€à·à¶¯à¶ºà¶±à·Š"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index f798fa5f24e701bc905c8c0e09449dcf5f0f7a84..9fcdc0a05a40595e7bb637a4639d399851c81303 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -19,51 +19,55 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "à¶‹à¶¯à·€à·Š"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "à¶´à·žà¶¯à·Šà¶œà¶½à·’à¶š"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "à·ƒà·’à¶§à·”à·€à¶¸à·Š"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "à¶´à¶»à·’à·à·“à¶½à¶šà¶ºà¶±à·Š"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "à¶ºà·™à¶¯à·”à¶¸à·Š"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "à¶´à¶»à·’à¶´à·à¶½à¶š"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP à¶·à·à¶œà¶ à¶šà·’à¶»à·“à¶¸à·Š à¶…à¶šà·Šâ€à¶»à·’à¶ºà¶ºà·’"
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "à¶œà·œà¶±à·” à¶‘à¶šà·’à¶±à·Š à¶‘à¶š à¶·à·à¶œà¶ à¶ºà·”à¶à·”à¶ºà·’"
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "à¶œà·œà¶±à·” à·€à·™à¶à¶§ à¶±à·à·€à¶ à¶ºà¶±à·Šà¶±"
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "à·ƒà¶à·Šâ€à¶ºà·à¶´à¶±à¶º à¶šà·’à¶»à·“à¶¸à·š à¶¯à·à·à¶ºà¶šà·Š"
 
@@ -83,55 +87,55 @@ msgstr "à¶´à·™à·…"
 msgid "Images"
 msgstr "à¶…à¶±à·” à¶»à·–"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "à¶à¶à·Šà¶´à¶»à¶ºà¶±à·Šà¶§ à¶´à·™à¶»"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶šà¶§ à¶´à·™à¶»"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d à¶¸à·’à¶±à·’à¶à·Šà¶à·”à·€à¶±à·Šà¶§ à¶´à·™à¶»"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "à¶…à¶¯"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "à¶Šà¶ºà·š"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d à¶¯à·’à¶±à¶šà¶§ à¶´à·™à¶»"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "à¶´à·™à¶» à¶¸à·à·ƒà¶ºà·š"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "à¶´à·™à¶» à¶…à·€à·”à¶»à·”à¶¯à·Šà¶¯à·š"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "à¶…à·€à·”à¶»à·”à¶¯à·” à¶šà·“à¶´à¶ºà¶šà¶§ à¶´à·™à¶»"
 
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index 7997041c93cd423bfb1d5ac3b45845c7daccde49..f5d377619250ea66996f0ba0afb5c59d463f60ac 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "à¶šà·Šâ€à¶»à·’à¶ºà¶à·Šà¶¸à¶š à¶šà¶»à¶±à·Šà¶±"
 msgid "Saving..."
 msgstr "à·ƒà·”à¶»à·à¶šà·™à¶¸à·’à¶±à·Š à¶´à·€à¶à·“..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr ""
 
@@ -102,15 +102,15 @@ msgstr "à¶ºà·™à¶¯à·”à¶¸à¶šà·Š à¶‘à¶šà·Š à¶šà·’à¶»à·“à¶¸"
 msgid "More Apps"
 msgstr "à¶à·€à¶à·Š à¶ºà·™à¶¯à·”à¶¸à·Š"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "à¶ºà·™à¶¯à·”à¶¸à¶šà·Š à¶à·œà¶»à¶±à·Šà¶±"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -159,7 +159,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "à¶¸à·”à¶»à¶´à¶¯à¶º"
 
@@ -229,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "à¶±à·à¶¸à¶º"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "à·ƒà¶¸à·–à·„à¶º"
 
@@ -245,26 +245,30 @@ msgstr "à¶à¶±à¶±à·Šà¶±"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "à·€à·™à¶±à¶à·Š"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "à¶šà·à¶«à·Šà¶© à¶´à¶»à·’à¶´à·à¶½à¶š"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "à¶¸à¶šà· à¶¯à¶¸à¶±à·€à·"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index f44ac30b3ead4ebccacb8b80fa4ea569d0fadf97..536c0438d761840620ba90f7555073df44db3705 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr "SSL à¶…à·€à·à·Šâ€à¶ºà¶º à·€à¶± à·€à·’à¶§ à¶´à¶¸à¶«à¶šà·Š à·„à·à¶», 
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr "à¶à·œà¶§"
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/si_LK/user_webdavauth.po b/l10n/si_LK/user_webdavauth.po
index b97c5beb1cc8e32c561492d58184e6484f368b3b..a6141d359c90502e160602e73ecdcac30140a92c 100644
--- a/l10n/si_LK/user_webdavauth.po
+++ b/l10n/si_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: si_LK\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/sk_SK/core.po b/l10n/sk_SK/core.po
index 7e64b445c71c97bc0895bc9a35d9f7c4c8e22ba7..de52d7a52d3ad3ff8b691c5f8fe9e298744ea929 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -4,15 +4,17 @@
 # 
 # Translators:
 #   <intense.feel@gmail.com>, 2011, 2012.
+# MariÃ¡n Hvolka <marian.hvolka@stuba.sk>, 2013.
 #   <martin.babik@gmail.com>, 2012.
+#   <mehturt@gmail.com>, 2013.
 # Roman Priesol <roman@priesol.net>, 2012.
 #   <zatroch.martin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -21,29 +23,29 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "PouÅ¾ÃvateÄ¾ %s zdieÄ¾a s Vami sÃºbor"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "PouÅ¾ÃvateÄ¾ %s zdieÄ¾a s Vami adresÃ¡r"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "PouÅ¾ÃvateÄ¾ %s zdieÄ¾a s Vami sÃºbor \"%s\".  MÃ´Å¾ete si ho stiahnuÅ¥ tu: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "PouÅ¾ÃvateÄ¾ %s zdieÄ¾a s Vami adresÃ¡r \"%s\".  MÃ´Å¾ete si ho stiahnuÅ¥ tu: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -83,59 +85,135 @@ 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/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "NedeÄ¾a"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Pondelok"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Utorok"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Streda"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Å tvrtok"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Piatok"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Sobota"
+
+#: js/config.php:33
+msgid "January"
+msgstr "JanuÃ¡r"
+
+#: js/config.php:33
+msgid "February"
+msgstr "FebruÃ¡r"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Marec"
+
+#: js/config.php:33
+msgid "April"
+msgstr "AprÃl"
+
+#: js/config.php:33
+msgid "May"
+msgstr "MÃ¡j"
+
+#: js/config.php:33
+msgid "June"
+msgstr "JÃºn"
+
+#: js/config.php:33
+msgid "July"
+msgstr "JÃºl"
+
+#: js/config.php:33
+msgid "August"
+msgstr "August"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "OktÃ³ber"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "December"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "pred minÃºtou"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minÃºtami"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "Pred 1 hodinou."
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "Pred {hours} hodinami."
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "vÄera"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "pred {days} dÅˆami"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "minulÃ½ mesiac"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "Pred {months} mesiacmi."
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "pred mesiacmi"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "pred rokmi"
 
@@ -165,8 +243,8 @@ msgid "The object type is not specified."
 msgstr "NeÅ¡pecifikovanÃ½ typ objektu."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Chyba"
 
@@ -178,122 +256,140 @@ msgstr "NeÅ¡pecifikovanÃ© meno aplikÃ¡cie."
 msgid "The required file {file} is not installed!"
 msgstr "PoÅ¾adovanÃ½ sÃºbor {file} nie je inÅ¡talovanÃ½!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Chyba poÄas zdieÄ¾ania"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Chyba poÄas ukonÄenia zdieÄ¾ania"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Chyba poÄas zmeny oprÃ¡vnenÃ"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ZdieÄ¾anÃ© s vami a so skupinou {group} pouÅ¾ÃvateÄ¾om {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "ZdieÄ¾anÃ© s vami pouÅ¾ÃvateÄ¾om {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "ZdieÄ¾aÅ¥ s"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "ZdieÄ¾aÅ¥ cez odkaz"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "ChrÃ¡niÅ¥ heslom"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Heslo"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
-msgstr ""
+msgstr "OdoslaÅ¥ odkaz osobe e-mailom"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
-msgstr ""
+msgstr "OdoslaÅ¥"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "NastaviÅ¥ dÃ¡tum expirÃ¡cie"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "DÃ¡tum expirÃ¡cie"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "ZdieÄ¾aÅ¥ cez e-mail:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "UÅ¾ÃvateÄ¾ nenÃ¡jdenÃ½"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ZdieÄ¾anie uÅ¾ zdieÄ¾anej poloÅ¾ky nie je povolenÃ©"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "ZdieÄ¾anÃ© v {item} s {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "ZruÅ¡iÅ¥ zdieÄ¾anie"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "mÃ´Å¾e upraviÅ¥"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "riadenie prÃstupu"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "vytvoriÅ¥"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "aktualizÃ¡cia"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "zmazaÅ¥"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "zdieÄ¾aÅ¥"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "ChrÃ¡nenÃ© heslom"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraÅˆovanÃ dÃ¡tumu vyprÅ¡ania platnosti"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavenÃ dÃ¡tumu vyprÅ¡ania platnosti"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
-msgstr ""
+msgstr "Odosielam ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
-msgstr ""
+msgstr "Email odoslanÃ½"
+
+#: 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 "AktualizÃ¡cia nebola ÃºspeÅ¡nÃ¡. ProblÃ©m nahlÃ¡ste na <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 "AktualizÃ¡cia bola ÃºspeÅ¡nÃ¡. PresmerovÃ¡vam na ownCloud."
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -446,87 +542,11 @@ msgstr "Server databÃ¡zy"
 msgid "Finish setup"
 msgstr "DokonÄiÅ¥ inÅ¡talÃ¡ciu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "NedeÄ¾a"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Pondelok"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Utorok"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Streda"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Å tvrtok"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Piatok"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Sobota"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "JanuÃ¡r"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "FebruÃ¡r"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Marec"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "AprÃl"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "MÃ¡j"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "JÃºn"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "JÃºl"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "August"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "OktÃ³ber"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "December"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "webovÃ© sluÅ¾by pod vaÅ¡ou kontrolou"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "OdhlÃ¡siÅ¥"
 
@@ -567,18 +587,4 @@ msgstr "Äalej"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "BezpeÄnostnÃ© varovanie!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "ProsÃm, overte svoje heslo. <br />Z bezpeÄnostnÃ½ch dÃ´vodov mÃ´Å¾ete byÅ¥ obÄas poÅ¾iadanÃ½ o jeho opÃ¤tovnÃ© zadanie."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Overenie"
+msgstr "Aktualizujem ownCloud na verziu %s, mÃ´Å¾e to chvÃÄ¾u trvaÅ¥."
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 1d4d69bb59e58dfba5ce9e01507d921a26f11f6b..083a241ac498fff0742154ed0d0983b634b90509 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <intense.feel@gmail.com>, 2012.
+# MariÃ¡n Hvolka <marian.hvolka@stuba.sk>, 2013.
 #   <martin.babik@gmail.com>, 2012.
 # Roman Priesol <roman@priesol.net>, 2012.
 #   <zatroch.martin@gmail.com>, 2012.
@@ -11,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -24,69 +25,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Nie je moÅ¾nÃ© presunÃºÅ¥ %s - sÃºbor s tÃ½mto menom uÅ¾ existuje"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Nie je moÅ¾nÃ© presunÃºÅ¥ %s"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "NemoÅ¾no premenovaÅ¥ sÃºbor"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Å½iaden sÃºbor nebol odoslanÃ½. NeznÃ¡ma chyba"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Nenastala Å¾iadna chyba, sÃºbor bol ÃºspeÅ¡ne nahranÃ½"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "NahranÃ½ sÃºbor predÄil  konfiguraÄnÃº direktÃvu upload_max_filesize v sÃºbore php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "NahrÃ¡vanÃ½ sÃºbor presiahol MAX_FILE_SIZE direktÃvu, ktorÃ¡ bola Å¡pecifikovanÃ¡ v HTML formulÃ¡ri"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "NahrÃ¡vanÃ½ sÃºbor bol iba ÄiastoÄne nahranÃ½"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Å½iaden sÃºbor nebol nahranÃ½"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ChÃ½bajÃºci doÄasnÃ½ prieÄinok"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ZÃ¡pis na disk sa nepodaril"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "NeplatnÃ½ adresÃ¡r"
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "SÃºbory"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "NezdielaÅ¥"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "OdstrÃ¡niÅ¥"
 
@@ -94,137 +95,151 @@ msgstr "OdstrÃ¡niÅ¥"
 msgid "Rename"
 msgstr "PremenovaÅ¥"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} uÅ¾ existuje"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "nahradiÅ¥"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "pomÃ´cÅ¥ s menom"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "zruÅ¡iÅ¥"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "prepÃsanÃ½ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "vrÃ¡tiÅ¥"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "prepÃsanÃ½ {new_name} sÃºborom {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "zdieÄ¾anie zruÅ¡enÃ© pre {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "zmazanÃ© {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' je neplatnÃ© meno sÃºboru."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Meno sÃºboru nemÃ´Å¾e byÅ¥ prÃ¡zdne"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "NesprÃ¡vne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sÃº povolenÃ© hodnoty."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "generujem ZIP-sÃºbor, mÃ´Å¾e to chvÃÄ¾u trvaÅ¥."
+#: 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:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Chyba odosielania"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "ZavrieÅ¥"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ÄŒakÃ¡ sa"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 sÃºbor sa posiela "
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: 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:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Odosielanie zruÅ¡enÃ©"
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL nemÃ´Å¾e byÅ¥ prÃ¡zdne"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "NeplatnÃ© meno adresÃ¡ra. PouÅ¾Ãvanie mena 'Shared' je vyhradenÃ© len pre Owncloud"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} sÃºborov prehÄ¾adanÃ½ch"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "chyba poÄas kontroly"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Meno"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "VeÄ¾kosÅ¥"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "UpravenÃ©"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 prieÄinok"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} prieÄinkov"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 sÃºbor"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} sÃºborov"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "OdoslaÅ¥"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Nastavenie sprÃ¡vanie k sÃºborom"
@@ -273,36 +288,32 @@ msgstr "PrieÄinok"
 msgid "From link"
 msgstr "Z odkazu"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "OdoslaÅ¥"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ZruÅ¡iÅ¥ odosielanie"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Å½iadny sÃºbor. Nahrajte nieÄo!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "StiahnuÅ¥"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "OdosielanÃ½ sÃºbor je prÃliÅ¡ veÄ¾kÃ½"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "ÄŒakajte, sÃºbory sÃº prehÄ¾adÃ¡vanÃ©."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "PrÃ¡ve prehliadanÃ©"
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index a698624cb5d6e34775bcc41e13b97a15e206dcf7..d2847e30d9ec2fa60d4b8fbe2b86e533bc5db8f1 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <intense.feel@gmail.com>, 2012.
+# MariÃ¡n Hvolka <marian.hvolka@stuba.sk>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 17:32+0000\n"
-"Last-Translator: intense <intense.feel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 14:49+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +19,66 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "ProsÃm, prejdite do svojho klienta ownCloud a zmente Å¡ifrovacie heslo na dokonÄenie konverzie."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "prepnutÃ© na Å¡ifrovanie prostrednÃctvom klienta"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "ZmeniÅ¥ Å¡ifrovacie heslo na prihlasovacie"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Skontrolujte si heslo a skÃºste to znovu."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Nie je moÅ¾nÃ© zmeniÅ¥ Å¡ifrovacie heslo na prihlasovacie"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "Vyberte reÅ¾im Å¡ifrovania:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Å ifrovanie prostrednÃctvom klienta (najbezpeÄnejÅ¡ia voÄ¾ba, neumoÅ¾Åˆuje vÅ¡ak prÃstup k sÃºborom z webovÃ©ho rozhrania)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "Å ifrovanie na serveri (umoÅ¾Åˆuje pristupovaÅ¥ k sÃºborom z webovÃ©ho rozhrania a desktopovÃ©ho klienta)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Å½iadne (Å¾iadne Å¡ifrovanie)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "DÃ´leÅ¾itÃ©: ak si zvolÃte reÅ¾im Å¡ifrovania, nie je moÅ¾nÃ© ho znovu zruÅ¡iÅ¥"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "DefinovanÃ½ pouÅ¾ÃvateÄ¾om (umoÅ¾Åˆuje pouÅ¾ÃvateÄ¾ovi vybraÅ¥ si)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Å ifrovanie"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "VynechaÅ¥ nasledujÃºce sÃºbory pri Å¡ifrovanÃ"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Å½iadne"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "ZapnÃºÅ¥ Å¡ifrovanie"
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 89f540dae6649c9291d688a0b453e583b1d2b06a..32d3549ff908a19c08907f273cb679100b8b01e0 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/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: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 18:45+0000\n"
-"Last-Translator: martinb <martin.babik@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "ExpirovaÅ¥ vÅ¡etky verzie"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "HistÃ³ria"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Verzie"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "BudÃº zmazanÃ© vÅ¡etky zÃ¡lohovanÃ© verzie vaÅ¡ich sÃºborov"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "VytvÃ¡ranie verziÃ sÃºborov"
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index ba1e859d9c919aaad3d7fea9ac0faca3065f10b3..693d9535e45eec212ed099c2bd70231c482a741d 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# MariÃ¡n Hvolka <marian.hvolka@stuba.sk>, 2013.
 #   <martin.babik@gmail.com>, 2012.
 # Roman Priesol <roman@priesol.net>, 2012.
 #   <zatroch.martin@gmail.com>, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 16:27+0000\n"
-"Last-Translator: martin <zatroch.martin@gmail.com>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 16:07+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +21,55 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "Pomoc"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "OsobnÃ©"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "UÅ¾Ãvatelia"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "AplikÃ¡cie"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "SprÃ¡vca"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "SÅ¥ahovanie sÃºborov ZIP je vypnutÃ©."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "SÃºbory musia byÅ¥ nahrÃ¡vanÃ© jeden za druhÃ½m."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "SpÃ¤Å¥ na sÃºbory"
 
-#: files.php:386
+#: files.php:390
 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:229
+msgid "couldn't be determined"
+msgstr "nedÃ¡ sa zistiÅ¥"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "AplikÃ¡cia nie je zapnutÃ¡"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Chyba autentifikÃ¡cie"
 
@@ -84,55 +89,55 @@ msgstr "Text"
 msgid "Images"
 msgstr "ObrÃ¡zky"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "pred sekundami"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "pred 1 minÃºtou"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "pred %d minÃºtami"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Pred 1 hodinou"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Pred %d hodinami."
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "dnes"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "vÄera"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "pred %d dÅˆami"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "minulÃ½ mesiac"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Pred %d mesiacmi."
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "minulÃ½ rok"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "pred rokmi"
 
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index e3c919f0ad8c406cde3b4543117a405900deea11..74bc6b025bb2a5651f40daef8c3c768a1f9c44c8 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <intense.feel@gmail.com>, 2011, 2012.
+# MariÃ¡n Hvolka <marian.hvolka@stuba.sk>, 2013.
 #   <martin.babik@gmail.com>, 2012.
 # Roman Priesol <roman@priesol.net>, 2012.
 #   <typhoon@zoznam.sk>, 2012.
@@ -12,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +93,7 @@ msgstr "PovoliÅ¥"
 msgid "Saving..."
 msgstr "UkladÃ¡m..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Slovensky"
 
@@ -104,41 +105,41 @@ msgstr "PridaÅ¥ vaÅ¡u aplikÃ¡ciu"
 msgid "More Apps"
 msgstr "Viac aplikÃ¡ciÃ"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Vyberte aplikÃ¡ciu"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Pozrite si strÃ¡nku aplikÃ¡ciÃ na apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licencovanÃ© <span class=\"author\"></span>"
 
 #: templates/help.php:3
 msgid "User Documentation"
-msgstr ""
+msgstr "PrÃruÄka pouÅ¾ÃvateÄ¾a"
 
 #: templates/help.php:4
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "PrÃruÄka sprÃ¡vcu"
 
 #: templates/help.php:6
 msgid "Online Documentation"
-msgstr ""
+msgstr "Online prÃruÄka"
 
 #: templates/help.php:7
 msgid "Forum"
-msgstr ""
+msgstr "FÃ³rum"
 
 #: templates/help.php:9
 msgid "Bugtracker"
-msgstr ""
+msgstr "Bugtracker"
 
 #: templates/help.php:11
 msgid "Commercial Support"
-msgstr ""
+msgstr "KomerÄnÃ¡ podpora"
 
 #: templates/personal.php:8
 #, php-format
@@ -151,17 +152,17 @@ msgstr "Klienti"
 
 #: templates/personal.php:13
 msgid "Download Desktop Clients"
-msgstr ""
+msgstr "StiahnuÅ¥ desktopovÃ©ho klienta"
 
 #: templates/personal.php:14
 msgid "Download Android Client"
-msgstr ""
+msgstr "StiahnuÅ¥ Android klienta"
 
 #: templates/personal.php:15
 msgid "Download iOS Client"
-msgstr ""
+msgstr "StiahnuÅ¥ iOS klienta"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Heslo"
 
@@ -211,15 +212,15 @@ msgstr "PomÃ´cÅ¥ s prekladom"
 
 #: templates/personal.php:52
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
 #: templates/personal.php:54
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "PouÅ¾ite tÃºto adresu pre pripojenie vÃ¡Å¡ho ownCloud k sÃºborovÃ©mu sprÃ¡vcovi"
 
 #: templates/personal.php:63
 msgid "Version"
-msgstr ""
+msgstr "Verzia"
 
 #: templates/personal.php:65
 msgid ""
@@ -231,11 +232,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Meno"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Skupiny"
 
@@ -245,28 +246,32 @@ msgstr "VytvoriÅ¥"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "PredvolenÃ© ÃºloÅ¾isko"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "NelimitovanÃ©"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "InÃ©"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "SprÃ¡vca skupiny"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "ÃšloÅ¾isko"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "PredvolenÃ©"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "OdstrÃ¡niÅ¥"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index fde4a583528306ba0bdea2570b0a8a439f3f72a4..497fea635a1d913939a9af60ba565664bbca92c1 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr "MÃ´Å¾ete vynechaÅ¥ protokol, s vÃ½nimkou poÅ¾adovania SSL. Vtedy zaÄnit
 msgid "Base DN"
 msgstr "ZÃ¡kladnÃ© DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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"
@@ -115,10 +119,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "ZÃ¡kladnÃ½ pouÅ¾ÃvateÄ¾skÃ½ strom"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "ZÃ¡kladnÃ½ skupinovÃ½ strom"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "AsociÃ¡cia Älena skupiny"
diff --git a/l10n/sk_SK/user_webdavauth.po b/l10n/sk_SK/user_webdavauth.po
index fe313b19276fd5c5c3b287628383f865da9d3bb6..4e77a87a39266b8d43d4bdc51fd0a00f798a0f2b 100644
--- a/l10n/sk_SK/user_webdavauth.po
+++ b/l10n/sk_SK/user_webdavauth.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# MariÃ¡n Hvolka <marian.hvolka@stuba.sk>, 2013.
 #   <zatroch.martin@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 16:01+0000\n"
+"Last-Translator: mhh <marian.hvolka@stuba.sk>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,13 +19,17 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV overenie"
+
 #: templates/settings.php:4
 msgid "URL: http://"
-msgstr ""
+msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud odoÅ¡le pouÅ¾ÃvateÄ¾skÃ© Ãºdajena zadanÃº URL. Plugin skontroluje odpoveÄ a povaÅ¾uje nÃ¡vratovou hodnotu HTTP 401 a 403 za neplatnÃ© Ãºdaje a vÅ¡etky ostatnÃ© hodnoty ako platnÃ© prihlasovacie Ãºdaje."
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 60b6da31073eb7bc95a4b0704ef00adec8b25d46..e489f98a6c9c9e21d60ced3c913089c1994db514 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "Uporanik %s je dal datoteko v souporabo z vami"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "Uporanik %s je dal mapo v souporabo z vami"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "Uporanik %s je dal datoteko \"%s\" v souporabo z vami. Prenesete jo lahko tukaj: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,59 +83,135 @@ msgstr "Za izbris ni izbrana nobena kategorija."
 msgid "Error removing %s from favorites."
 msgstr "Napaka pri odstranjevanju %s iz priljubljenih."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "nedelja"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "ponedeljek"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "torek"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "sreda"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Äetrtek"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "petek"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "sobota"
+
+#: js/config.php:33
+msgid "January"
+msgstr "januar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "februar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "marec"
+
+#: js/config.php:33
+msgid "April"
+msgstr "april"
+
+#: js/config.php:33
+msgid "May"
+msgstr "maj"
+
+#: js/config.php:33
+msgid "June"
+msgstr "junij"
+
+#: js/config.php:33
+msgid "July"
+msgstr "julij"
+
+#: js/config.php:33
+msgid "August"
+msgstr "avgust"
+
+#: js/config.php:33
+msgid "September"
+msgstr "september"
+
+#: js/config.php:33
+msgid "October"
+msgstr "oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "november"
+
+#: js/config.php:33
+msgid "December"
+msgstr "december"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "pred minuto"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "pred {minutes} minutami"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "pred 1 uro"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "pred {hours} urami"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "danes"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "vÄeraj"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "pred {days} dnevi"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "zadnji mesec"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "pred {months} meseci"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "mesecev nazaj"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "lansko leto"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "let nazaj"
 
@@ -165,8 +241,8 @@ msgid "The object type is not specified."
 msgstr "Vrsta predmeta ni podana."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Napaka"
 
@@ -178,123 +254,141 @@ msgstr "Ime aplikacije ni podano."
 msgid "The required file {file} is not installed!"
 msgstr "Zahtevana datoteka {file} ni nameÅ¡Äena!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Napaka med odstranjevanjem souporabe"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Napaka med spreminjanjem dovoljenj"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "V souporabi z vami in skupino {group}. Lastnik je {owner}."
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "V souporabi z vami. Lastnik je {owner}."
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "OmogoÄi souporabo z"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "OmogoÄi souporabo s povezavo"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "ZaÅ¡Äiti z geslom"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Geslo"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Posreduj povezavo po e-poÅ¡ti"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "PoÅ¡lji"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Nastavi datum preteka"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Datum preteka"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Souporaba preko elektronske poÅ¡te:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Ponovna souporaba ni omogoÄena"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Odstrani souporabo"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "izbriÅ¡e"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "doloÄi souporabo"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "ZaÅ¡Äiteno z geslom"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Napaka med nastavljanjem datuma preteka"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "PoÅ¡iljam ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "E-poÅ¡ta je bila poslana"
 
+#: js/update.js:14
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr ""
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Ponastavitev gesla ownCloud"
@@ -446,87 +540,11 @@ msgstr "Gostitelj podatkovne zbirke"
 msgid "Finish setup"
 msgstr "DokonÄaj namestitev"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "nedelja"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "ponedeljek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "torek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "sreda"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Äetrtek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "petek"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "sobota"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "januar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "februar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "marec"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "april"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "maj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "junij"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "julij"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "avgust"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "september"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "november"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "december"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "spletne storitve pod vaÅ¡im nadzorom"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Odjava"
 
@@ -568,17 +586,3 @@ msgstr "naprej"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Varnostno opozorilo!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Prosimo, Äe preverite vaÅ¡e geslo. Iz varnostnih razlogov vas lahko obÄasno prosimo, da ga ponovno vnesete."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Preveri"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 5ed732142e86918125c15a5f24bce3e10277ecfc..2302abc53769aa1f31181b0238139e0917871bdb 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -35,46 +35,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Nobena datoteka ni naloÅ¾ena. Neznana napaka."
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Datoteka je uspeÅ¡no naloÅ¾ena brez napak."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "NaloÅ¾ena datoteka presega dovoljeno velikost. Le-ta je doloÄena z vrstico upload_max_filesize v datoteki php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "NaloÅ¾ena datoteka presega velikost, ki jo doloÄa parameter MAX_FILE_SIZE v HTML obrazcu"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Datoteka je le delno naloÅ¾ena"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Nobena datoteka ni bila naloÅ¾ena"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Manjka zaÄasna mapa"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Pisanje na disk je spodletelo"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,11 +82,11 @@ msgstr ""
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Odstrani iz souporabe"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "IzbriÅ¡i"
 
@@ -94,137 +94,151 @@ msgstr "IzbriÅ¡i"
 msgid "Rename"
 msgstr "Preimenuj"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} Å¾e obstaja"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "zamenjaj"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "predlagaj ime"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "prekliÄi"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "zamenjano je ime {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "zamenjano ime {new_name} z imenom {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "odstranjeno iz souporabe {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "izbrisano {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Neveljavno ime, znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Ustvarjanje datoteke ZIP. To lahko traja nekaj Äasa."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Napaka med nalaganjem"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Zapri"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "V Äakanju ..."
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "PoÅ¡iljanje 1 datoteke"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "nalagam {count} datotek"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "PoÅ¡iljanje je preklicano."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "Naslov URL ne sme biti prazen."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} files scanned"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "napaka med pregledovanjem datotek"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 mapa"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} map"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 datoteka"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} datotek"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "PoÅ¡lji"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Upravljanje z datotekami"
@@ -273,36 +287,32 @@ msgstr "Mapa"
 msgid "From link"
 msgstr "Iz povezave"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "PoÅ¡lji"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "PrekliÄi poÅ¡iljanje"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj ni niÄesar. NaloÅ¾ite kaj!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Prejmi"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Nalaganje ni mogoÄe, ker je preveliko"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Poteka preuÄevanje datotek, poÄakajte ..."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Trenutno poteka preuÄevanje"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index ee5f5c6ec056722642681bd8eca863beecd46ac7..934903b3bc5c4b83442b2cb2072d1d0d66e9136e 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 16:57+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +19,66 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Å ifriranje"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Navedene vrste datotek naj ne bodo Å¡ifrirane"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Brez"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "OmogoÄi Å¡ifriranje"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 2bde547fb1f86768bf910054166bfdd3df8030b6..1a4d2854d91db2f5baff937c0a6d4d8c7971ffa4 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.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-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 17:00+0000\n"
-"Last-Translator: mateju <>\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"
 "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,22 +19,10 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Zastaraj vse razliÄice"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Zgodovina"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "RazliÄice"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "S tem bodo izbrisane vse obstojeÄe razliÄice varnostnih kopij vaÅ¡ih datotek"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Sledenje razliÄicam"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 606aa03de9d0098b8b53d002f0036c32772b09b6..4af090e968d26dc6e957820ba680deb3ed3cca4e 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.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-11-20 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 19:49+0000\n"
-"Last-Translator: Peter PeroÅ¡a <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "PomoÄ"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Osebno"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Uporabniki"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Programi"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "SkrbniÅ¡tvo"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Prejem datotek ZIP je onemogoÄen."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke je mogoÄe prejeti le posamiÄ."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Program ni omogoÄen"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Napaka overitve"
 
@@ -83,55 +87,55 @@ msgstr "Besedilo"
 msgid "Images"
 msgstr "Slike"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "pred nekaj sekundami"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "pred minuto"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "pred %d minutami"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Pred 1 uro"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Pred %d urami"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "danes"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "vÄeraj"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "pred %d dnevi"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "prejÅ¡nji mesec"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Pred %d meseci"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "lani"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "pred nekaj leti"
 
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 4e336bf871a7946168e66e2753b372c8be0a84d2..225f4e3a20362386074a8f9f0c8cbf8ce7f0bce0 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "OmogoÄi"
 msgid "Saving..."
 msgstr "Poteka shranjevanje ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -103,15 +103,15 @@ msgstr "Dodaj program"
 msgid "More Apps"
 msgstr "VeÄ programov"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Izberite program"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "ObiÅ¡Äite spletno stran programa na apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-z dovoljenjem s strani <span class=\"author\"></span>"
 
@@ -160,7 +160,7 @@ msgstr "Prenesi Android odjemalec"
 msgid "Download iOS Client"
 msgstr "Prenesi iOS odjemalec"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Geslo"
 
@@ -230,11 +230,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ime"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Skupine"
 
@@ -246,26 +246,30 @@ msgstr "Ustvari"
 msgid "Default Storage"
 msgstr "Privzeta shramba"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "Neomejeno"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Skrbnik skupine"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Shramba"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "Privzeto"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "IzbriÅ¡i"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index d34b56f8c01340f93521b753f6bbf33d4b591ffb..9671d69486e37677e1fd8f2fae535b00ac3227e7 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.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:46+0000\n"
-"Last-Translator: Peter PeroÅ¡a <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -28,9 +28,9 @@ msgstr "<b>Opozorilo:</b> Aplikaciji user_ldap in user_webdavauth nista zdruÅ¾lj
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Opozorilo:</b> PHP LDAP modul mora biti nameÅ¡Äen, sicer ta vmesnik ne bo deloval. Prosimo, prosite vaÅ¡ega skrbnika, Äe ga namesti."
+"<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 "Host"
@@ -45,6 +45,10 @@ msgstr "Protokol je lahko izpuÅ¡Äen, Äe ni posebej zahtevan SSL. V tem primeru
 msgid "Base DN"
 msgstr "Osnovni DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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"
@@ -116,10 +120,18 @@ msgstr "Vrata"
 msgid "Base User Tree"
 msgstr "Osnovno uporabniÅ¡ko drevo"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Osnovno drevo skupine"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Povezava Älana skupine"
diff --git a/l10n/sl/user_webdavauth.po b/l10n/sl/user_webdavauth.po
index c6891589fd46552dc450ad596571b2f9fcb16041..05172dc5b954ff05bdc862587c0a17f613b18d88 100644
--- a/l10n/sl/user_webdavauth.po
+++ b/l10n/sl/user_webdavauth.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-02 00:04+0100\n"
-"PO-Revision-Date: 2013-01-01 14:17+0000\n"
-"Last-Translator: Peter PeroÅ¡a <peter.perosa@gmail.com>\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"
 "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"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud bo poslal uporabniÅ¡ka poverila temu URL naslovu. Pri tem bo interpretiral http 401 in http 403 odgovor kot spodletelo avtentikacijo ter vse ostale http odgovore kot uspeÅ¡ne."
+"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/sq/core.po b/l10n/sq/core.po
index 0646f7fd17c12b5725a300a7b3f3282a9edd4798..4c77ff63f84f368e0398b1f5253805751e4bf509 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -207,7 +207,6 @@ msgid "Password protect"
 msgstr ""
 
 #: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -564,17 +563,3 @@ msgstr ""
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/sq/files.po b/l10n/sq/files.po
index 57c754a69e087970cfa0fb5c4ed35c04ac2a7af1..ea89733fef69cbc2717940f039da92814917e99b 100644
--- a/l10n/sq/files.po
+++ b/l10n/sq/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:20
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:30
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:31
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:33
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:35
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:36
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:37
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:38
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
+#: ajax/upload.php:57
 msgid "Not enough space available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:91
 msgid "Invalid directory."
 msgstr ""
 
@@ -126,98 +131,100 @@ msgstr ""
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:48
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:53
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:62
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:242
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:242
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:259
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:298
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:486
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:559
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:565
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:775
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:783
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
 msgid "Name"
 msgstr ""
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
 msgid "Size"
 msgstr ""
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:829
+#: js/files.js:878
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:880
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:888
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:890
 msgid "{count} files"
 msgstr ""
 
@@ -269,10 +276,6 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
diff --git a/l10n/sq/files_versions.po b/l10n/sq/files_versions.po
index 97616a406363044c6ee44ff13ec96088ab57edbf..5128bf7cf1b90d70bef206dfdbaba55c5f7a8fd0 100644
--- a/l10n/sq/files_versions.po
+++ b/l10n/sq/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/sq/lib.po b/l10n/sq/lib.po
index 431a0e3c621f649327ba5c9904537bd8639647c1..ce2ab5c3311d4103b3dd0e982bf88a302c9f5190 100644
--- a/l10n/sq/lib.po
+++ b/l10n/sq/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: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,51 +17,55 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr ""
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr ""
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr ""
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr ""
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:386
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 3c0afbd378aca3e596f2de23b1bd000d4578d136..4c54b0c5724f2e02e595329e84b90ab93aea775c 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/sq/user_webdavauth.po b/l10n/sq/user_webdavauth.po
index 132bf6829adccce9e6067d4eb5596bf9d90fc7ec..1a2d007461b34c326325b5577d1a33af7db7b8eb 100644
--- a/l10n/sq/user_webdavauth.po
+++ b/l10n/sq/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: sq\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/sr/core.po b/l10n/sr/core.po
index f715cccd51c7dd635c2054d990c2c86fe2f01df5..80d0ec2de4ff80110e2c6f2971c5d28c33131a3b 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ivan PetroviÄ‡ <ivan@ipplusstudio.com>, 2012.
+# Ivan PetroviÄ‡ <ivan@ipplusstudio.com>, 2012-2013.
 #   <marko@evizo.com>, 2012.
 # Slobodan TerziÄ‡ <githzerai06@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -20,24 +20,24 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº %s Ð´ÐµÐ»Ð¸ ÑÐ° Ð²Ð°Ð¼Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ðº %s Ð´ÐµÐ»Ð¸ ÑÐ° Ð²Ð°Ð¼Ð° Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ˜ÑƒÐ¼"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -82,59 +82,135 @@ msgstr "ÐÐ¸ Ñ˜ÐµÐ´Ð½Ð° ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ð¸Ñ˜Ð° Ð½Ð¸Ñ˜Ðµ Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð° Ð·Ð° Ð±Ñ€
 msgid "Error removing %s from favorites."
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸Ð»Ð¸ÐºÐ¾Ð¼ ÑƒÐºÐ»Ð°ÑšÐ°ÑšÐ° %s Ð¸Ð· Ð¾Ð¼Ð¸Ñ™ÐµÐ½Ð¸Ñ…"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "ÐÐµÐ´ÐµÑ™Ð°"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÑ™Ð°Ðº"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Ð£Ñ‚Ð¾Ñ€Ð°Ðº"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Ð¡Ñ€ÐµÐ´Ð°"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð°Ðº"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "ÐŸÐµÑ‚Ð°Ðº"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°"
+
+#: js/config.php:33
+msgid "January"
+msgstr "ÐˆÐ°Ð½ÑƒÐ°Ñ€"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Ð¤ÐµÐ±Ñ€ÑƒÐ°Ñ€"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ÐœÐ°Ñ€Ñ‚"
+
+#: js/config.php:33
+msgid "April"
+msgstr "ÐÐ¿Ñ€Ð¸Ð»"
+
+#: js/config.php:33
+msgid "May"
+msgstr "ÐœÐ°Ñ˜"
+
+#: js/config.php:33
+msgid "June"
+msgstr "ÐˆÑƒÐ½"
+
+#: js/config.php:33
+msgid "July"
+msgstr "ÐˆÑƒÐ»"
+
+#: js/config.php:33
+msgid "August"
+msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð±Ð°Ñ€"
+
+#: js/config.php:33
+msgid "October"
+msgstr "ÐžÐºÑ‚Ð¾Ð±Ð°Ñ€"
+
+#: js/config.php:33
+msgid "November"
+msgstr "ÐÐ¾Ð²ÐµÐ¼Ð±Ð°Ñ€"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Ð”ÐµÑ†ÐµÐ¼Ð±Ð°Ñ€"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "Ð¿Ñ€Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€Ðµ 1 Ð¼Ð¸Ð½ÑƒÑ‚"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "Ð¿Ñ€Ðµ {minutes} Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "ÐŸÑ€Ðµ Ñ˜ÐµÐ´Ð½Ð¾Ð³ ÑÐ°Ñ‚Ð°"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "ÐŸÑ€Ðµ {hours} ÑÐ°Ñ‚Ð° (ÑÐ°Ñ‚Ð¸)"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "Ð´Ð°Ð½Ð°Ñ"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ñ˜ÑƒÑ‡Ðµ"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "Ð¿Ñ€Ðµ {days} Ð´Ð°Ð½Ð°"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³ Ð¼ÐµÑÐµÑ†Ð°"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "ÐŸÑ€Ðµ {months} Ð¼ÐµÑÐµÑ†Ð° (Ð¼ÐµÑÐµÑ†Ð¸)"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Ð¼ÐµÑÐµÑ†Ð¸ Ñ€Ð°Ð½Ð¸Ñ˜Ðµ"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ðµ Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ€Ð°Ð½Ð¸Ñ˜Ðµ"
 
@@ -164,8 +240,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ°"
 
@@ -177,121 +253,139 @@ msgstr "Ð˜Ð¼Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð½Ð¸Ñ˜Ðµ ÑƒÐ½ÐµÑ‚Ð¾."
 msgid "The required file {file} is not installed!"
 msgstr "ÐŸÐ¾Ñ‚Ñ€ÐµÐ±Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° {file} Ð½Ð¸Ñ˜Ðµ Ð¸Ð½ÑÑ‚Ð°Ð»Ð¸Ñ€Ð°Ð½Ð°."
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ñƒ Ð´ÐµÑ™ÐµÑšÑƒ"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÑšÐ° Ð´ÐµÑ™ÐµÑšÐ°"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»Ð°"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Ð”ÐµÑ™ÐµÐ½Ð¾ ÑÐ° Ð²Ð°Ð¼Ð° Ð¸ ÑÐ° Ð³Ñ€ÑƒÐ¿Ð¾Ð¼ {group}. ÐŸÐ¾Ð´ÐµÐ»Ð¸Ð¾ {owner}."
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸Ð¾ ÑÐ° Ð²Ð°Ð¼Ð° {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ ÑÐ°"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð»Ð¸Ð½Ðº"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
-msgstr ""
+msgstr "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "ÐŸÐ¾ÑÑ‚Ð°Ð²Ð¸ Ð´Ð°Ñ‚ÑƒÐ¼ Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Ð”Ð°Ñ‚ÑƒÐ¼ Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "ÐŸÐ¾Ð´ÐµÐ»Ð¸ Ð¿Ð¾ÑˆÑ‚Ð¾Ð¼:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "ÐžÑÐ¾Ð±Ðµ Ð½Ð¸ÑÑƒ Ð¿Ñ€Ð¾Ð½Ð°Ñ’ÐµÐ½Ðµ."
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐ¾Ð½Ð¾Ð²Ð½Ð¾ Ð´ÐµÑ™ÐµÑšÐµ Ð½Ð¸Ñ˜Ðµ Ð´Ð¾Ð·Ð²Ð¾Ñ™ÐµÐ½Ð¾"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "ÐŸÐ¾Ð´ÐµÑ™ÐµÐ½Ð¾ ÑƒÐ½ÑƒÑ‚Ð°Ñ€ {item} ÑÐ° {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "ÐÐµ Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¼ÐµÑšÐ°"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "Ð¿Ñ€Ð°Ð²Ð° Ð¿Ñ€Ð¸ÑÑ‚ÑƒÐ¿Ð°"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "Ð°Ð¶ÑƒÑ€Ð¸Ñ€Ð°Ñ˜"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "Ð¾Ð±Ñ€Ð¸ÑˆÐ¸"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "Ð¿Ð¾Ð´ÐµÐ»Ð¸"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Ð—Ð°ÑˆÑ‚Ð¸Ñ›ÐµÐ½Ð¾ Ð»Ð¾Ð·Ð¸Ð½ÐºÐ¾Ð¼"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾Ð½Ð¸ÑˆÑ‚Ð°Ð²Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° ÐºÐ¾Ð´ Ð¿Ð¾ÑÑ‚Ð°Ð²Ñ™Ð°ÑšÐ° Ð´Ð°Ñ‚ÑƒÐ¼Ð° Ð¸ÑÑ‚ÐµÐºÐ°"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
-msgstr ""
+msgstr "Ð¨Ð°Ñ™ÐµÐ¼..."
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
@@ -445,87 +539,11 @@ msgstr "Ð”Ð¾Ð¼Ð°Ñ›Ð¸Ð½ Ð±Ð°Ð·Ðµ"
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²Ñ€ÑˆÐ¸ Ð¿Ð¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐµ"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "ÐÐµÐ´ÐµÑ™Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "ÐŸÐ¾Ð½ÐµÐ´ÐµÑ™Ð°Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Ð£Ñ‚Ð¾Ñ€Ð°Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Ð¡Ñ€ÐµÐ´Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Ð§ÐµÑ‚Ð²Ñ€Ñ‚Ð°Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "ÐŸÐµÑ‚Ð°Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "ÐˆÐ°Ð½ÑƒÐ°Ñ€"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Ð¤ÐµÐ±Ñ€ÑƒÐ°Ñ€"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ÐœÐ°Ñ€Ñ‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "ÐÐ¿Ñ€Ð¸Ð»"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "ÐœÐ°Ñ˜"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "ÐˆÑƒÐ½"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "ÐˆÑƒÐ»"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "ÐÐ²Ð³ÑƒÑÑ‚"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Ð¡ÐµÐ¿Ñ‚ÐµÐ¼Ð±Ð°Ñ€"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "ÐžÐºÑ‚Ð¾Ð±Ð°Ñ€"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "ÐÐ¾Ð²ÐµÐ¼Ð±Ð°Ñ€"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Ð”ÐµÑ†ÐµÐ¼Ð±Ð°Ñ€"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ± ÑÐµÑ€Ð²Ð¸ÑÐ¸ Ð¿Ð¾Ð´ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ð¾Ð¼"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "ÐžÐ´Ñ˜Ð°Ð²Ð°"
 
@@ -566,18 +584,4 @@ msgstr "ÑÐ»ÐµÐ´ÐµÑ›Ðµ"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Ð¡Ð¸Ð³ÑƒÑ€Ð½Ð¾ÑÐ½Ð¾ ÑƒÐ¿Ð¾Ð·Ð¾Ñ€ÐµÑšÐµ!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸Ñ‚Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ. <br />Ð˜Ð· ÑÐ¸Ð³ÑƒÑ€Ð½Ð¾ÑÐ½Ð¸Ñ… Ñ€Ð°Ð·Ð»Ð¾Ð³Ð° Ð·Ð°Ñ‚Ñ€ÐµÐ¶Ð¸Ñ›ÐµÐ¼Ð¾ Ð²Ð°Ð¼ Ð´Ð° Ð´Ð²Ð° Ð¿ÑƒÑ‚Ð° ÑƒÐ½ÐµÑÐµÑ‚Ðµ Ð»Ð¾Ð·Ð¸Ð½ÐºÑƒ."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ÐŸÐ¾Ñ‚Ð²Ñ€Ð´Ð¸"
+msgstr "ÐÐ°Ð´Ð¾Ð³Ñ€Ð°Ð´ÑšÐ° ownCloud-Ð° Ð½Ð° Ð²ÐµÑ€Ð·Ð¸Ñ˜Ñƒ %s, ÑÐ°Ñ‡ÐµÐºÐ°Ñ˜Ñ‚Ðµ Ñ‚Ñ€ÐµÐ½ÑƒÑ‚Ð°Ðº."
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 745936119029e8ec83a33415b79ef9344e3eb88c..06cef3e3222af562551cbae6850c9a60770cdb60 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -34,46 +34,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "ÐÐ¸Ñ˜Ðµ Ð´Ð¾ÑˆÐ»Ð¾ Ð´Ð¾ Ð³Ñ€ÐµÑˆÐºÐµ. Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜Ðµ ÑƒÑÐ¿ÐµÑˆÐ½Ð¾ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ñ™ÐµÐ½Ð°."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ñ™ÐµÐ½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ð¿Ñ€ÐµÐ»Ð°Ð·Ð¸ ÑÐ¼ÐµÑ€Ð½Ð¸Ñ†Ñƒ upload_max_filesize Ñƒ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÑ†Ð¸ php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ñ™ÐµÐ½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ð¿Ñ€ÐµÐ»Ð°Ð·Ð¸ ÑÐ¼ÐµÑ€Ð½Ð¸Ñ†Ñƒ MAX_FILE_SIZE ÐºÐ¾Ñ˜Ð° Ñ˜Ðµ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ð° Ñƒ HTML Ð¾Ð±Ñ€Ð°ÑÑ†Ñƒ"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜Ðµ Ð´ÐµÐ»Ð¸Ð¼Ð¸Ñ‡Ð½Ð¾ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ñ™ÐµÐ½Ð°"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ð½Ð¸Ñ˜Ðµ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ñ™ÐµÐ½Ð°"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ÐÐµÐ´Ð¾ÑÑ‚Ð°Ñ˜Ðµ Ð¿Ñ€Ð¸Ð²Ñ€ÐµÐ¼ÐµÐ½Ð° Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¿Ð¸ÑˆÐµÐ¼ Ð½Ð° Ð´Ð¸ÑÐº"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -81,11 +81,11 @@ msgstr ""
 msgid "Files"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Ð£ÐºÐ¸Ð½Ð¸ Ð´ÐµÑ™ÐµÑšÐµ"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸"
 
@@ -93,137 +93,151 @@ msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸"
 msgid "Rename"
 msgstr "ÐŸÑ€ÐµÐ¸Ð¼ÐµÐ½ÑƒÑ˜"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²ÐµÑ› Ð¿Ð¾ÑÑ‚Ð¾Ñ˜Ð¸"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ð·Ð°Ð¼ÐµÐ½Ð¸"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶Ð¸ Ð½Ð°Ð·Ð¸Ð²"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Ð¾Ñ‚ÐºÐ°Ð¶Ð¸"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "Ð·Ð°Ð¼ÐµÑšÐµÐ½Ð¾ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Ð¾Ð¿Ð¾Ð·Ð¾Ð²Ð¸"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼ÐµÑšÐµÐ½Ð¾ {new_name} ÑÐ° {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "ÑƒÐºÐ¸Ð½ÑƒÑ‚Ð¾ Ð´ÐµÑ™ÐµÑšÐµ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "Ð¾Ð±Ñ€Ð¸ÑÐ°Ð½Ð¾ {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ÐÐµÐ¸ÑÐ¿Ñ€Ð°Ð²Ð°Ð½ Ð½Ð°Ð·Ð¸Ð². Ð¡Ð»ÐµÐ´ÐµÑ›Ð¸ Ð·Ð½Ð°ÐºÐ¾Ð²Ð¸ Ð½Ð¸ÑÑƒ Ð´Ð¾Ð·Ð²Ð¾Ñ™ÐµÐ½Ð¸: \\, /, <, >, :, \", |, ? Ð¸ *."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Ð¿Ñ€Ð°Ð²Ð¸Ð¼ ZIP Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒâ€¦"
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ÐÐµ Ð¼Ð¾Ð³Ñƒ Ð´Ð° Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð¸Ð¼ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ ÐºÐ°Ð¾ Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ñƒ Ð¸Ð»Ð¸ Ð¾Ð½Ð° Ð¸Ð¼Ð° 0 Ð±Ð°Ñ˜Ñ‚Ð¾Ð²Ð°"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÑƒ"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Ð—Ð°Ñ‚Ð²Ð¾Ñ€Ð¸"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ÐÐ° Ñ‡ÐµÐºÐ°ÑšÑƒ"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼ 1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°Ð¼ {count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ/Ð°"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ Ñ˜Ðµ Ð¿Ñ€ÐµÐºÐ¸Ð½ÑƒÑ‚Ð¾."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ñ˜Ðµ Ñƒ Ñ‚Ð¾ÐºÑƒ. ÐÐºÐ¾ ÑÐ°Ð´Ð° Ð½Ð°Ð¿ÑƒÑÑ‚Ð¸Ñ‚Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ, Ð¿Ñ€ÐµÐºÐ¸Ð½ÑƒÑ›ÐµÑ‚Ðµ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "Ð¡ÐºÐµÐ½Ð¸Ñ€Ð°Ð½Ð¾ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°: {count}"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Ð³Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ ÑÐºÐµÐ½Ð¸Ñ€Ð°ÑšÑƒ"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "ÐÐ°Ð·Ð¸Ð²"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Ð’ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð°"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Ð˜Ð·Ð¼ÐµÑšÐµÐ½Ð¾"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ðµ/Ð¸"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ/Ð°"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Ð£Ð¿Ñ€Ð°Ð²Ñ™Ð°ÑšÐµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°Ð¼Ð°"
@@ -272,36 +286,32 @@ msgstr "Ñ„Ð°ÑÑ†Ð¸ÐºÐ»Ð°"
 msgid "From link"
 msgstr "Ð¡Ð° Ð²ÐµÐ·Ðµ"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ÐŸÑ€ÐµÐºÐ¸Ð½Ð¸ Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð°ÑšÐµ"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "ÐžÐ²Ð´Ðµ Ð½ÐµÐ¼Ð° Ð½Ð¸Ñ‡ÐµÐ³. ÐžÑ‚Ð¿Ñ€ÐµÐ¼Ð¸Ñ‚Ðµ Ð½ÐµÑˆÑ‚Ð¾!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¼Ð¸"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ° Ñ˜Ðµ Ð¿Ñ€ÐµÐ²ÐµÐ»Ð¸ÐºÐ°"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ ÐºÐ¾Ñ˜Ðµ Ð¶ÐµÐ»Ð¸Ñ‚Ðµ Ð´Ð° Ð¾Ñ‚Ð¿Ñ€ÐµÐ¼Ð¸Ñ‚Ðµ Ð¿Ñ€ÐµÐ»Ð°Ð·Ðµ Ð¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÑšÐµ Ñƒ Ð²ÐµÐ»Ð¸Ñ‡Ð¸Ð½Ð¸."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Ð¡ÐºÐµÐ½Ð¸Ñ€Ð°Ð¼ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµâ€¦"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Ð¢Ñ€ÐµÐ½ÑƒÑ‚Ð½Ð¾ ÑÐºÐµÐ½Ð¸Ñ€Ð°ÑšÐµ"
diff --git a/l10n/sr/files_encryption.po b/l10n/sr/files_encryption.po
index a0a21dd2c8412e0316440aedb7304c3583936eab..7765fc06e6c88bf8cbb5e731510a62a63701003a 100644
--- a/l10n/sr/files_encryption.po
+++ b/l10n/sr/files_encryption.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 15:06+0000\n"
-"Last-Translator: Kostic <marko@evizo.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,66 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Ð¨Ð¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐµ"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "ÐÐµ ÑˆÐ¸Ñ„Ñ€ÑƒÑ˜ ÑÐ»ÐµÐ´ÐµÑ›Ðµ Ñ‚Ð¸Ð¿Ð¾Ð²Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐ°"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "ÐÐ¸ÑˆÑ‚Ð°"
-
-#: templates/settings.php:12
-msgid "Enable Encryption"
-msgstr "ÐžÐ¼Ð¾Ð³ÑƒÑ›Ð¸ ÑˆÐ¸Ñ„Ñ€Ð¾Ð²Ð°ÑšÐµ"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 36c9d0ac46714f72ad4b9603fe51dc627d03a80c..345fb947c117f9e0a0720b135ea33aabe2ae9dd8 100644
--- a/l10n/sr/files_sharing.po
+++ b/l10n/sr/files_sharing.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-24 00:06+0100\n"
+"PO-Revision-Date: 2013-01-23 08:30+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,26 +23,26 @@ msgstr ""
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "ÐŸÐ¾ÑˆÐ°Ñ™Ð¸"
 
-#: templates/public.php:9
+#: templates/public.php:17
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:11
+#: templates/public.php:19
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:14 templates/public.php:30
+#: templates/public.php:22 templates/public.php:38
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:29
+#: templates/public.php:37
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:43
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index 592163313fce3945ab90f07b99542954da1fcd82..7c031b84aa7493f10853c45765b368ffb8975065 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 0ffcb3e09d3cd7f91b6ccb54065f3f911c5d2160..3b899eb0222dde6ea669e48286ba3361c0bf76bc 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Ivan PetroviÄ‡ <ivan@ipplusstudio.com>, 2012.
+# Ivan PetroviÄ‡ <ivan@ipplusstudio.com>, 2012-2013.
 #   <theranchcowboy@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 19:18+0000\n"
-"Last-Translator: Rancher <theranchcowboy@gmail.com>\n"
+"POT-Creation-Date: 2013-01-24 00:06+0100\n"
+"PO-Revision-Date: 2013-01-23 08:24+0000\n"
+"Last-Translator: Ivan PetroviÄ‡ <ivan@ipplusstudio.com>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "ÐŸÐ¾Ð¼Ð¾Ñ›"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Ð›Ð¸Ñ‡Ð½Ð¾"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "ÐŸÐ¾Ð´ÐµÑˆÐ°Ð²Ð°ÑšÐ°"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÐ½Ð¸Ñ†Ð¸"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ðµ"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ˜Ð°"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ÐŸÑ€ÐµÑƒÐ·Ð¸Ð¼Ð°ÑšÐµ ZIP-Ð° Ñ˜Ðµ Ð¸ÑÐºÑ™ÑƒÑ‡ÐµÐ½Ð¾."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€ÐµÑƒÐ·Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ˜ÐµÐ´Ð½Ñƒ Ð¿Ð¾ Ñ˜ÐµÐ´Ð½Ñƒ."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ÐÐ°Ð·Ð°Ð´ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Ð˜Ð·Ð°Ð±Ñ€Ð°Ð½Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ ÑÑƒ Ð¿Ñ€ÐµÐ²ÐµÐ»Ð¸ÐºÐµ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¸ ZIP Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "Ð½Ð¸Ñ˜Ðµ Ð¾Ð´Ñ€ÐµÑ’ÐµÐ½Ð¾"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ð½Ð¸Ñ˜Ðµ Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½Ð°"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°"
 
@@ -83,55 +87,55 @@ msgstr "Ð¢ÐµÐºÑÑ‚"
 msgid "Images"
 msgstr "Ð¡Ð»Ð¸ÐºÐµ"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "Ð¿Ñ€Ðµ Ð½ÐµÐºÐ¾Ð»Ð¸ÐºÐ¾ ÑÐµÐºÑƒÐ½Ð´Ð¸"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "Ð¿Ñ€Ðµ 1 Ð¼Ð¸Ð½ÑƒÑ‚"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "Ð¿Ñ€Ðµ %d Ð¼Ð¸Ð½ÑƒÑ‚Ð°"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "Ð¿Ñ€Ðµ 1 ÑÐ°Ñ‚"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "Ð¿Ñ€Ðµ %d ÑÐ°Ñ‚Ð°/Ð¸"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "Ð´Ð°Ð½Ð°Ñ"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ñ˜ÑƒÑ‡Ðµ"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "Ð¿Ñ€Ðµ %d Ð´Ð°Ð½Ð°"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ð¾Ð³ Ð¼ÐµÑÐµÑ†Ð°"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "Ð¿Ñ€Ðµ %d Ð¼ÐµÑÐµÑ†Ð°/Ð¸"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ð¿Ñ€Ð¾ÑˆÐ»Ðµ Ð³Ð¾Ð´Ð¸Ð½Ðµ"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ð° Ñ€Ð°Ð½Ð¸Ñ˜Ðµ"
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index dca5c1ac469c611fd1f186f5b757066765eaae6e..2d04a031388b3be99fa77bae0f279c80a4e9c976 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Ð£ÐºÑ™ÑƒÑ‡Ð¸"
 msgid "Saving..."
 msgstr "Ð§ÑƒÐ²Ð°ÑšÐµ Ñƒ Ñ‚Ð¾ÐºÑƒ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -101,15 +101,15 @@ msgstr "Ð”Ð¾Ð´Ð°Ñ˜Ñ‚Ðµ Ð²Ð°Ñˆ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼"
 msgid "More Apps"
 msgstr "Ð’Ð¸ÑˆÐµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð°"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Ð˜Ð·Ð°Ð±ÐµÑ€Ð¸Ñ‚Ðµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "ÐŸÐ¾Ð³Ð»ÐµÐ´Ð°Ñ˜Ñ‚Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ ÑÐ° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸Ð¼Ð° Ð½Ð° apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-Ð»Ð¸Ñ†ÐµÐ½Ñ†Ð¸Ñ€Ð°Ð¾ <span class=\"author\"></span>"
 
@@ -158,7 +158,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Ð›Ð¾Ð·Ð¸Ð½ÐºÐ°"
 
@@ -228,11 +228,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ð˜Ð¼Ðµ"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ðµ"
 
@@ -244,26 +244,30 @@ msgstr "ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Ð”Ñ€ÑƒÐ³Ð¾"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "Ð£Ð¿Ñ€Ð°Ð²Ð½Ð¸Ðº Ð³Ñ€ÑƒÐ¿Ðµ"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "ÐžÐ±Ñ€Ð¸ÑˆÐ¸"
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 2af4aa92fab738912a57e64ae1bf00eaa8f9417e..00ff848a20a118a850a86925a03e2acae3c4f840 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "ÐŸÐ¾Ð¼Ð¾Ñ›"
diff --git a/l10n/sr/user_webdavauth.po b/l10n/sr/user_webdavauth.po
index 914fb17354ee9d298cc0ee908d6a29f24406771f..8e72a9d363ad8c67ce16bcd4e74cd18e108a6c4a 100644
--- a/l10n/sr/user_webdavauth.po
+++ b/l10n/sr/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr ""
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/sr@latin/core.po b/l10n/sr@latin/core.po
index 62f3de31a2f18f4a85fbf7affe6081c1dd296152..fd54f215b9b491b6473b2c6d74df40b9726b991d 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Nedelja"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Ponedeljak"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Utorak"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Sreda"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "ÄŒetvrtak"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Petak"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Subota"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januar"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februar"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Mart"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maj"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Jun"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Jul"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Avgust"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Septembar"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktobar"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Novembar"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Decembar"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "PodeÅ¡avanja"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr ""
 
@@ -175,123 +251,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Lozinka"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -443,87 +537,11 @@ msgstr "DomaÄ‡in baze"
 msgid "Finish setup"
 msgstr "ZavrÅ¡i podeÅ¡avanje"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Nedelja"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Ponedeljak"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Utorak"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Sreda"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "ÄŒetvrtak"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Petak"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Subota"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Mart"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Jun"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Jul"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Avgust"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Septembar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktobar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Novembar"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Decembar"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Odjava"
 
@@ -565,17 +583,3 @@ msgstr "sledeÄ‡e"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 81511f85a805618fd3a8c1e6d3ca1ee9c00ec1a4..baa78945561799c95f9324a096e1d1bfc2328f7f 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -32,46 +32,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Nema greÅ¡ke, fajl je uspeÅ¡no poslat"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Poslati fajl je samo delimiÄno otpremljen!"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Nijedan fajl nije poslat"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Nedostaje privremena fascikla"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -79,11 +79,11 @@ msgstr ""
 msgid "Files"
 msgstr "Fajlovi"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "ObriÅ¡i"
 
@@ -91,137 +91,151 @@ msgstr "ObriÅ¡i"
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Zatvori"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ime"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "VeliÄina"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "PoÅ¡alji"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -270,36 +284,32 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "PoÅ¡alji"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema niÄeg. PoÅ¡aljite neÅ¡to!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "PoÅ¡iljka je prevelika"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/sr@latin/files_encryption.po b/l10n/sr@latin/files_encryption.po
index c6f3f5b636c24a387883850f63ffff8a2e825129..39f12cfb59bc0e6a4de3d9d488f209506cd23556 100644
--- a/l10n/sr@latin/files_encryption.po
+++ b/l10n/sr@latin/files_encryption.po
@@ -7,28 +7,76 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "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"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 1f2db94b8adde2525db89a1989505c2c65f5a1a6..a35cd43237b53a3f32bf749d70a84f3ca571ffb8 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index edcbb0203e215883ab6bfe383695512d480de9c2..264724c09118aac7e113bc74708a5fc69cad28ff 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "PomoÄ‡"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "LiÄno"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "PodeÅ¡avanja"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "Korisnici"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "GreÅ¡ka pri autentifikaciji"
 
@@ -81,55 +85,55 @@ msgstr "Tekst"
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index c11e3c37bfb9fb3e9913cbae84bc65e11603a187..e22f8796d2944cfe4a6010c730cd9570245027ee 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr ""
 
@@ -100,15 +100,15 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Izaberite program"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -157,7 +157,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Lozinka"
 
@@ -227,11 +227,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ime"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupe"
 
@@ -243,26 +243,30 @@ msgstr "Napravi"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Drugo"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "ObriÅ¡i"
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 47549f334d558f023fcf30b0389963372b029ebe..c78635ad495a4a8c0c3fd8eaa68e9312b82a1e0c 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 21:57+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
@@ -180,4 +192,4 @@ msgstr ""
 
 #: templates/settings.php:39
 msgid "Help"
-msgstr ""
+msgstr "PomoÄ‡"
diff --git a/l10n/sr@latin/user_webdavauth.po b/l10n/sr@latin/user_webdavauth.po
index 9fe7b885a102bc54d109323ab4be7ee445a18616..246116723c6910e7a2517f1316fa74d89d36cfd0 100644
--- a/l10n/sr@latin/user_webdavauth.po
+++ b/l10n/sr@latin/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: sr@latin\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr ""
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/sv/core.po b/l10n/sv/core.po
index 36584ca3131a9075922f5f504bba03c798f1e830..0df2d492ca5b79679c9618d22c5b0c08865c7e8b 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AndrÃ© <lokal_profil@hotmail.com>, 2013.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
 #   <hakan.thn@gmail.com>, 2011.
@@ -13,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -23,24 +24,24 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "AnvÃ¤ndare %s delade en fil med dig"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "AnvÃ¤ndare %s delade en mapp med dig"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr "AnvÃ¤ndare %s delade filen \"%s\" med dig. Den finns att ladda ner hÃ¤r: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -85,59 +86,135 @@ msgstr "Inga kategorier valda fÃ¶r radering."
 msgid "Error removing %s from favorites."
 msgstr "Fel vid borttagning av %s frÃ¥n favoriter."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "SÃ¶ndag"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "MÃ¥ndag"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Tisdag"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Fredag"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "LÃ¶rdag"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Januari"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Februari"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Mars"
+
+#: js/config.php:33
+msgid "April"
+msgstr "April"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Maj"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Juni"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Juli"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Augusti"
+
+#: js/config.php:33
+msgid "September"
+msgstr "September"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Oktober"
+
+#: js/config.php:33
+msgid "November"
+msgstr "November"
+
+#: js/config.php:33
+msgid "December"
+msgstr "December"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "InstÃ¤llningar"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuter sedan"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} timmar sedan"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "i gÃ¥r"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} dagar sedan"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "fÃ¶rra mÃ¥naden"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} mÃ¥nader sedan"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "mÃ¥nader sedan"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "fÃ¶rra Ã¥ret"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
@@ -167,8 +244,8 @@ msgid "The object type is not specified."
 msgstr "Objekttypen Ã¤r inte specificerad."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Fel"
 
@@ -180,123 +257,141 @@ msgstr " Namnet pÃ¥ appen Ã¤r inte specificerad."
 msgid "The required file {file} is not installed!"
 msgstr "Den nÃ¶dvÃ¤ndiga filen {file} Ã¤r inte installerad!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Fel nÃ¤r delning skulle avslutas"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Fel vid Ã¤ndring av rÃ¤ttigheter"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "Delad med dig och gruppen {group} av {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "Delad med dig av {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Delad med"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Delad med lÃ¤nk"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "LÃ¶senordsskydda"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "LÃ¶senord"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "E-posta lÃ¤nk till person"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "Skicka"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "SÃ¤tt utgÃ¥ngsdatum"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "UtgÃ¥ngsdatum"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Dela via e-post:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Hittar inga anvÃ¤ndare"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Dela vidare Ã¤r inte tillÃ¥tet"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "Delad i {item} med {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "kan redigera"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "Ã¥tkomstkontroll"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "skapa"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "uppdatera"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "radera"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "LÃ¶senordsskyddad"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgÃ¥ngsdatum"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Fel vid sÃ¤ttning av utgÃ¥ngsdatum"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "Skickar ..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "E-post skickat"
 
+#: 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 "Uppdateringen misslyckades. Rapportera detta problem till <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud-gemenskapen</a>."
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud"
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud lÃ¶senordsÃ¥terstÃ¤llning"
@@ -448,87 +543,11 @@ msgstr "Databasserver"
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "SÃ¶ndag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "MÃ¥ndag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Tisdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Fredag"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "LÃ¶rdag"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Januari"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Februari"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Mars"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "April"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Maj"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Juni"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Juli"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Augusti"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "September"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Oktober"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "November"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "December"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "webbtjÃ¤nster under din kontroll"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Logga ut"
 
@@ -570,17 +589,3 @@ msgstr "nÃ¤sta"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "Uppdaterar ownCloud till version %s, detta kan ta en stund."
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "SÃ¤kerhetsvarning!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "BekrÃ¤fta ditt lÃ¶senord. <br/>Av sÃ¤kerhetsskÃ¤l kan du ibland bli ombedd att ange ditt lÃ¶senord igen."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Verifiera"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 16e2e1025638201dfee65cd58275013913c726c5..8ad64f646e8ef1e6e365dc69f44d4f7ed47d838f 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# AndrÃ© <lokal_profil@hotmail.com>, 2013.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel Sandman <revoltism@gmail.com>, 2012.
 # Magnus HÃ¶glund <magnus@linux.com>, 2012-2013.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 09:25+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"
@@ -26,57 +27,57 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "Kunde inte flytta %s - Det finns redan en fil med detta namn"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "Kan inte flytta %s"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Kan inte byta namn pÃ¥ filen"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Ingen fil uppladdad. OkÃ¤nt fel"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Inga fel uppstod. Filen laddades upp utan problem"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Den uppladdade filen Ã¶verskrider upload_max_filesize direktivet php.ini:"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Den uppladdade filen Ã¶verstiger MAX_FILE_SIZE direktivet som anges i HTML-formulÃ¤r"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Den uppladdade filen var endast delvis uppladdad"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "Ingen fil blev uppladdad"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Saknar en tillfÃ¤llig mapp"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Misslyckades spara till disk"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "Inte tillrÃ¤ckligt med utrymme tillgÃ¤ngligt"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "Inte tillrÃ¤ckligt med lagringsutrymme tillgÃ¤ngligt"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "Felaktig mapp."
 
@@ -84,11 +85,11 @@ msgstr "Felaktig mapp."
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Radera"
 
@@ -96,137 +97,151 @@ msgstr "Radera"
 msgid "Rename"
 msgstr "Byt namn"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} finns redan"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "ersÃ¤tt"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "fÃ¶reslÃ¥ namn"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "ersatt {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Ã¥ngra"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "ersatt {new_name} med {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "stoppad delning {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "raderade {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' Ã¤r ett ogiltigt filnamn."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "Filnamn kan inte vara tomt."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' Ã¤r inte tillÃ¥tet."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "genererar ZIP-fil, det kan ta lite tid."
+#: js/files.js:78
+msgid "Your storage is full, files can not be updated or synced anymore!"
+msgstr "Ditt lagringsutrymme Ã¤r fullt, filer kan ej lÃ¤ngre laddas upp eller synkas!"
+
+#: js/files.js:82
+msgid "Your storage is almost full ({usedSpacePercent}%)"
+msgstr "Ditt lagringsutrymme Ã¤r nÃ¤stan fullt ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Uppladdningsfel"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "StÃ¤ng"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "VÃ¤ntar"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 filuppladdning"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} filer laddas upp"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL kan inte vara tom."
 
-#: js/files.js:543
+#: js/files.js:571
 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:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} filer skannade"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "fel vid skanning"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Namn"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Ã„ndrad"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 mapp"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} mappar"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 fil"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} filer"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Ladda upp"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Filhantering"
@@ -275,36 +290,32 @@ msgstr "Mapp"
 msgid "From link"
 msgstr "FrÃ¥n lÃ¤nk"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ladda upp"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting hÃ¤r. Ladda upp nÃ¥got!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "FÃ¶r stor uppladdning"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vÃ¤nta"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Aktuell skanning"
diff --git a/l10n/sv/files_encryption.po b/l10n/sv/files_encryption.po
index 421650694832ca9f5dd4fcf07284a315e1571251..cb599b8ee0c9319631a3ef8eb0e0993427f62039 100644
--- a/l10n/sv/files_encryption.po
+++ b/l10n/sv/files_encryption.po
@@ -3,33 +3,81 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Magnus HÃ¶glund <magnus@linux.com>, 2012.
+# Magnus HÃ¶glund <magnus@linux.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-13 10:20+0000\n"
+"POT-Creation-Date: 2013-01-25 00:05+0100\n"
+"PO-Revision-Date: 2013-01-24 20:45+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "VÃ¤nligen vÃ¤xla till ownCloud klienten och Ã¤ndra ditt krypteringslÃ¶senord fÃ¶r att slutfÃ¶ra omvandlingen."
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "Bytte till kryptering pÃ¥ klientsidan"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "Ã„ndra krypteringslÃ¶senord till loginlÃ¶senord"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "Kontrollera dina lÃ¶senord och fÃ¶rsÃ¶k igen."
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "Kunde inte Ã¤ndra ditt filkrypteringslÃ¶senord till ditt loginlÃ¶senord"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "VÃ¤lj krypteringslÃ¤ge:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "Kryptering pÃ¥ klientsidan (sÃ¤kraste men gÃ¶r det omÃ¶jligt att komma Ã¥t dina filer med en webblÃ¤sare)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "Kryptering pÃ¥ serversidan (kan komma Ã¥t dina filer frÃ¥n webblÃ¤sare och datorklient)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "Ingen (ingen kryptering alls)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "Viktigt: NÃ¤r du har valt ett krypteringslÃ¤ge finns det inget sÃ¤tt att Ã¤ndra tillbaka"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "AnvÃ¤ndarspecifik (lÃ¥ter anvÃ¤ndaren bestÃ¤mma)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Exkludera fÃ¶ljande filtyper frÃ¥n kryptering"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ingen"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Aktivera kryptering"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index a926036b8921d1c090bfef5e0c1f6c0bc4cab05f..5f3d273b389e704bd1d32ad693bcdd25642cb28d 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: 2012-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 11:20+0000\n"
-"Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "UpphÃ¶r alla versioner"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Historik"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Versioner"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Detta kommer att radera alla befintliga sÃ¤kerhetskopior av dina filer"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Versionshantering av filer"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 548f7a84d4c469bd68ec3ee40b73b649a1cda8ea..3fea987f13fd0dade9282861223d02bcbd7855b5 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Magnus HÃ¶glund <magnus@linux.com>, 2012.
+# Magnus HÃ¶glund <magnus@linux.com>, 2012-2013.
 #   <magnus@linux.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 07:21+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 14:32+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"
@@ -19,51 +19,55 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "HjÃ¤lp"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "Personligt"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "InstÃ¤llningar"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "AnvÃ¤ndare"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Program"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP Ã¤r avstÃ¤ngd."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en Ã¥t gÃ¥ngen."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:357
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer Ã¤r fÃ¶r stora fÃ¶r att skapa zip-fil."
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "kunde inte bestÃ¤mmas"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Applikationen Ã¤r inte aktiverad"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Fel vid autentisering"
 
@@ -83,55 +87,55 @@ msgstr "Text"
 msgid "Images"
 msgstr "Bilder"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minuter sedan"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d timmar sedan"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "idag"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "igÃ¥r"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d dagar sedan"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "fÃ¶rra mÃ¥naden"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d mÃ¥nader sedan"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "fÃ¶rra Ã¥ret"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ã¥r sedan"
 
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index b51b40b34257fba9f90df2c6b9c39fc30edbd692..3b39b6e2312f8d123464bde6eb3dcb22c8d80270 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -95,7 +95,7 @@ msgstr "Aktivera"
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -107,15 +107,15 @@ msgstr "LÃ¤gg till din applikation"
 msgid "More Apps"
 msgstr "Fler Appar"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "VÃ¤lj en App"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "Se programsida pÃ¥ apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>"
 
@@ -164,7 +164,7 @@ msgstr "Ladda ner klient fÃ¶r Android"
 msgid "Download iOS Client"
 msgstr "Ladda ner klient fÃ¶r iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "LÃ¶senord"
 
@@ -234,11 +234,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Namn"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Grupper"
 
@@ -250,26 +250,30 @@ msgstr "Skapa"
 msgid "Default Storage"
 msgstr "FÃ¶rvald lagring"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "ObegrÃ¤nsad"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Annat"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "GruppadministratÃ¶r"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "Lagring"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "FÃ¶rvald"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Radera"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 76ca9c7622498fd781aa68fe108dc5b09ca88924..4455df0fb2f733d4d47c1c328cfa3c4410d33506 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Magnus HÃ¶glund <magnus@linux.com>, 2012.
+# Magnus HÃ¶glund <magnus@linux.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-18 00:13+0100\n"
-"PO-Revision-Date: 2012-12-17 19:54+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 15:10+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"
@@ -27,9 +27,9 @@ msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth Ã¤r inkompatibla. Ov
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Varning:</b> PHP LDAP-modulen mÃ¥ste vara installerad, serversidan kommer inte att fungera. Be din systemadministratÃ¶r att installera den."
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>Varning:</b> PHP LDAP - modulen Ã¤r inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratÃ¶r fÃ¶r installation."
 
 #: templates/settings.php:15
 msgid "Host"
@@ -44,6 +44,10 @@ msgstr "Du behÃ¶ver inte ange protokoll fÃ¶rutom om du anvÃ¤nder SSL. Starta dÃ¥
 msgid "Base DN"
 msgstr "Start DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "Ett Start DN per rad"
+
 #: templates/settings.php:16
 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"
@@ -115,10 +119,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "Bas fÃ¶r anvÃ¤ndare i katalogtjÃ¤nst"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "En AnvÃ¤ndare start DN per rad"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Bas fÃ¶r grupper i katalogtjÃ¤nst"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "En Grupp start DN per rad"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Attribut fÃ¶r gruppmedlemmar"
diff --git a/l10n/sv/user_webdavauth.po b/l10n/sv/user_webdavauth.po
index b2063cd23bc28ba77945e854f4d123a2093e0f99..98475a8bd9775afb679e26b017dc40cc6af859f8 100644
--- a/l10n/sv/user_webdavauth.po
+++ b/l10n/sv/user_webdavauth.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Magnus HÃ¶glund <magnus@linux.com>, 2012.
+# Magnus HÃ¶glund <magnus@linux.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-26 00:10+0100\n"
-"PO-Revision-Date: 2012-12-25 08:03+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 15:25+0000\n"
 "Last-Translator: Magnus HÃ¶glund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Autentisering"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud kommer att skicka inloggningsuppgifterna till denna URL och tolkar http 401 och http 403 som fel och alla andra koder som korrekt."
+"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 kommer skicka anvÃ¤ndaruppgifterna till denna URL. Denna plugin kontrollerar svaret och tolkar HTTP-statuskoderna 401 och 403 som felaktiga uppgifter, och alla andra svar som giltiga uppgifter."
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index f35d465eb3ba48b87cb43f2bd8964c101d4d1517..ec703bdcd4e77e5e7c7e3b1c67bf93e267bd8b3d 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr "à®¨à¯€à®•à¯à®•à¯à®µà®¤à®±à¯à®•à¯ à®Žà®¨à¯à®¤à®ªà¯ à®ªà®¿à®°à®¿à®µ
 msgid "Error removing %s from favorites."
 msgstr "à®µà®¿à®°à¯à®ªà¯à®ªà®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ %s à® à®…à®•à®±à¯à®±à¯à®µà®¤à®¿à®²à¯ à®µà®´à¯.à®‰à®‡à®‡"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "à®žà®¾à®¯à®¿à®±à¯à®±à¯à®•à¯à®•à®¿à®´à®®à¯ˆ"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "à®¤à®¿à®™à¯à®•à®Ÿà¯à®•à®¿à®´à®®à¯ˆ"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "à®šà¯†à®µà¯à®µà®¾à®¯à¯à®•à¯à®•à®¿à®´à®®à¯ˆ"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "à®ªà¯à®¤à®©à¯à®•à®¿à®´à®®à¯ˆ"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "à®µà®¿à®¯à®¾à®´à®•à¯à®•à®¿à®´à®®à¯ˆ"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "à®µà¯†à®³à¯à®³à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "à®šà®©à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ"
+
+#: js/config.php:33
+msgid "January"
+msgstr "à®¤à¯ˆ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "à®®à®¾à®šà®¿"
+
+#: js/config.php:33
+msgid "March"
+msgstr "à®ªà®™à¯à®•à¯à®©à®¿"
+
+#: js/config.php:33
+msgid "April"
+msgstr "à®šà®¿à®¤à¯à®¤à®¿à®°à¯ˆ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "à®µà¯ˆà®•à®¾à®šà®¿"
+
+#: js/config.php:33
+msgid "June"
+msgstr "à®†à®©à®¿"
+
+#: js/config.php:33
+msgid "July"
+msgstr "à®†à®Ÿà®¿"
+
+#: js/config.php:33
+msgid "August"
+msgstr "à®†à®µà®£à®¿"
+
+#: js/config.php:33
+msgid "September"
+msgstr "à®ªà¯à®°à®Ÿà¯à®Ÿà®¾à®šà®¿"
+
+#: js/config.php:33
+msgid "October"
+msgstr "à®à®ªà¯à®ªà®šà®¿"
+
+#: js/config.php:33
+msgid "November"
+msgstr "à®•à®¾à®°à¯à®¤à¯à®¤à®¿à®•à¯ˆ"
+
+#: js/config.php:33
+msgid "December"
+msgstr "à®®à®¾à®°à¯à®•à®´à®¿"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 à®¨à®¿à®®à®¿à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ "
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯} à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯ "
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à¯} à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®™à¯à®•à®³à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "à®‡à®©à¯à®±à¯"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "à®¨à¯‡à®±à¯à®±à¯"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{à®¨à®¾à®Ÿà¯à®•à®³à¯} à®¨à®¾à®Ÿà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®®à®¾à®¤à®®à¯"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{à®®à®¾à®¤à®™à¯à®•à®³à¯} à®®à®¾à®¤à®™à¯à®•à®³à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "à®®à®¾à®¤à®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®µà®°à¯à®Ÿà®®à¯"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "à®µà®°à¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "à®µà®´à¯"
 
@@ -175,123 +251,141 @@ msgstr "à®šà¯†à®¯à®²à®¿ à®ªà¯†à®¯à®°à¯ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿ
 msgid "The required file {file} is not installed!"
 msgstr "à®¤à¯‡à®µà¯ˆà®ªà¯à®ªà®Ÿà¯à®Ÿ à®•à¯‹à®ªà¯à®ªà¯ {à®•à¯‹à®ªà¯à®ªà¯} à®¨à®¿à®±à¯à®µà®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "à®ªà®•à®¿à®°à¯à®®à¯ à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "à®ªà®•à®¿à®°à®¾à®®à®²à¯ à®‰à®³à¯à®³à®ªà¯à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "à®…à®©à¯à®®à®¤à®¿à®•à®³à¯ à®®à®¾à®±à¯à®®à¯à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà®©à¯à®®à¯ à®•à¯à®´à¯à®µà¯à®•à¯à®•à®¿à®Ÿà¯ˆà®¯à®¿à®²à¯à®®à¯ {à®•à¯à®´à¯} à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {à®‰à®°à®¿à®®à¯ˆà®¯à®¾à®³à®°à¯}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà®©à¯ à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯ {à®‰à®°à®¿à®®à¯ˆà®¯à®¾à®³à®°à¯}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "à®‡à®£à¯ˆà®ªà¯à®ªà¯à®Ÿà®©à¯ à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®ªà®¾à®¤à¯à®•à®¾à®¤à¯à®¤à®²à¯"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿ à®¤à¯‡à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®•"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "à®•à®¾à®²à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "à®®à®¿à®©à¯à®©à®žà¯à®šà®²à®¿à®©à¯‚à®Ÿà®¾à®© à®ªà®•à®¿à®°à¯à®µà¯: "
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "à®¨à®ªà®°à¯à®•à®³à¯ à®¯à®¾à®°à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "à®®à¯€à®³à¯à®ªà®•à®¿à®°à¯à®µà®¤à®±à¯à®•à¯ à®…à®©à¯à®®à®¤à®¿ à®‡à®²à¯à®²à¯ˆ "
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "{à®ªà®¯à®©à®¾à®³à®°à¯} à®‰à®Ÿà®©à¯ {à®‰à®°à¯à®ªà¯à®ªà®Ÿà®¿} à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "à®ªà®•à®¿à®°à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "à®¤à¯Šà®•à¯à®•à¯à®• à®®à¯à®Ÿà®¿à®¯à¯à®®à¯"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà®¾à®© à®…à®£à¯à®•à®²à¯"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "à®ªà®Ÿà¯ˆà®¤à¯à®¤à®²à¯"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "à®‡à®±à¯à®±à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "à®¨à¯€à®•à¯à®•à¯à®•"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "à®ªà®•à®¿à®°à¯à®¤à®²à¯"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®ªà®¾à®¤à¯à®•à®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®¾à®®à¯ˆà®•à¯à®•à®¾à®© à®µà®´à¯"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à¯à®®à¯ à®¤à®¿à®•à®¤à®¿à®¯à¯ˆ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà¯à®µà®¤à®¿à®²à¯ à®µà®´à¯"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud à®‡à®©à¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯ à®®à¯€à®³à®®à¯ˆà®ªà¯à®ªà¯"
@@ -443,87 +537,11 @@ msgstr "à®¤à®°à®µà¯à®¤à¯à®¤à®³ à®“à®®à¯à®ªà¯à®©à®°à¯"
 msgid "Finish setup"
 msgstr "à®…à®®à¯ˆà®ªà¯à®ªà¯ˆ à®®à¯à®Ÿà®¿à®•à¯à®•"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "à®žà®¾à®¯à®¿à®±à¯à®±à¯à®•à¯à®•à®¿à®´à®®à¯ˆ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "à®¤à®¿à®™à¯à®•à®Ÿà¯à®•à®¿à®´à®®à¯ˆ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "à®šà¯†à®µà¯à®µà®¾à®¯à¯à®•à¯à®•à®¿à®´à®®à¯ˆ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "à®ªà¯à®¤à®©à¯à®•à®¿à®´à®®à¯ˆ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "à®µà®¿à®¯à®¾à®´à®•à¯à®•à®¿à®´à®®à¯ˆ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "à®µà¯†à®³à¯à®³à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "à®šà®©à®¿à®•à¯à®•à®¿à®´à®®à¯ˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "à®¤à¯ˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "à®®à®¾à®šà®¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "à®ªà®™à¯à®•à¯à®©à®¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "à®šà®¿à®¤à¯à®¤à®¿à®°à¯ˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "à®µà¯ˆà®•à®¾à®šà®¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "à®†à®©à®¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "à®†à®Ÿà®¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "à®†à®µà®£à®¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "à®ªà¯à®°à®Ÿà¯à®Ÿà®¾à®šà®¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "à®à®ªà¯à®ªà®šà®¿"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "à®•à®¾à®°à¯à®¤à¯à®¤à®¿à®•à¯ˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "à®®à®¾à®°à¯à®•à®´à®¿"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "à®‰à®™à¯à®•à®³à¯ à®•à®Ÿà¯à®Ÿà¯à®ªà¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®©à¯ à®•à¯€à®´à¯ à®‡à®£à¯ˆà®¯ à®šà¯‡à®µà¯ˆà®•à®³à¯"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "à®µà®¿à®Ÿà¯à®ªà®¤à®¿à®•à¯ˆ à®šà¯†à®¯à¯à®•"
 
@@ -565,17 +583,3 @@ msgstr "à®…à®Ÿà¯à®¤à¯à®¤à¯"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯ à®Žà®šà¯à®šà®°à®¿à®•à¯à®•à¯ˆ!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®‰à®±à¯à®¤à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•. <br/> à®ªà®¾à®¤à¯à®•à®¾à®ªà¯à®ªà¯ à®•à®¾à®°à®£à®™à¯à®•à®³à¯à®•à¯à®•à®¾à®• à®¨à¯€à®™à¯à®•à®³à¯ à®Žà®ªà¯à®ªà¯‹à®¤à®¾à®µà®¤à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯à®²à¯ˆ à®®à¯€à®£à¯à®Ÿà¯à®®à¯ à®¨à¯à®´à¯ˆà®•à¯à®• à®•à¯‡à®Ÿà¯à®•à®ªà¯à®ªà®Ÿà¯à®µà¯€à®°à¯à®•à®³à¯."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "à®‰à®±à¯à®¤à®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à¯"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index 5c90380e9ab76c3533dfc43dbc418145e1c08766..9f5d785083a5b9f7676c078c256f7e75fad44b0b 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -32,46 +32,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "à®’à®°à¯ à®•à¯‹à®ªà¯à®ªà¯à®®à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ. à®…à®±à®¿à®¯à®ªà¯à®ªà®Ÿà®¾à®¤ à®µà®´à¯"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "à®‡à®™à¯à®•à¯ à®µà®´à¯ à®‡à®²à¯à®²à¯ˆ, à®•à¯‹à®ªà¯à®ªà¯ à®µà¯†à®±à¯à®±à®¿à®•à®°à®®à®¾à®• à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿ à®•à¯‹à®ªà¯à®ªà®¾à®©à®¤à¯ HTML  à®ªà®Ÿà®¿à®µà®¤à¯à®¤à®¿à®²à¯ à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³ MAX_FILE_SIZE  directive à® à®µà®¿à®Ÿ à®•à¯‚à®Ÿà®¿à®¯à®¤à¯"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿ à®•à¯‹à®ªà¯à®ªà®¾à®©à®¤à¯ à®ªà®•à¯à®¤à®¿à®¯à®¾à®• à®®à®Ÿà¯à®Ÿà¯à®®à¯‡ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "à®Žà®¨à¯à®¤ à®•à¯‹à®ªà¯à®ªà¯à®®à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà®µà®¿à®²à¯à®²à¯ˆ"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "à®’à®°à¯ à®¤à®±à¯à®•à®¾à®²à®¿à®•à®®à®¾à®© à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®¯à¯ˆ à®•à®¾à®£à®µà®¿à®²à¯à®²à¯ˆ"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "à®µà®Ÿà¯à®Ÿà®¿à®²à¯ à®Žà®´à¯à®¤ à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -79,11 +79,11 @@ msgstr ""
 msgid "Files"
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà®¾à®¤à®¤à¯"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "à®…à®´à®¿à®•à¯à®•"
 
@@ -91,137 +91,151 @@ msgstr "à®…à®´à®¿à®•à¯à®•"
 msgid "Rename"
 msgstr "à®ªà¯†à®¯à®°à¯à®®à®¾à®±à¯à®±à®®à¯"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} à®à®±à¯à®•à®©à®µà¯‡ à®‰à®³à¯à®³à®¤à¯"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "à®®à®¾à®±à¯à®±à®¿à®Ÿà¯à®•"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "à®ªà¯†à®¯à®°à¯ˆ à®ªà®°à®¿à®¨à¯à®¤à¯à®°à¯ˆà®•à¯à®•"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "à®®à¯à®©à¯ à®šà¯†à®¯à®²à¯ à®¨à¯€à®•à¯à®•à®®à¯ "
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} à®†à®©à®¤à¯ {old_name} à®‡à®©à®¾à®²à¯ à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "à®ªà®•à®¿à®°à®ªà¯à®ªà®Ÿà®¾à®¤à®¤à¯  {à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "à®¨à¯€à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯  {à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "à®šà¯†à®²à¯à®²à¯à®ªà®Ÿà®¿à®¯à®±à¯à®± à®ªà¯†à®¯à®°à¯,'\\', '/', '<', '>', ':', '\"', '|', '?' à®®à®±à¯à®±à¯à®®à¯ '*' à®†à®•à®¿à®¯à®© à®…à®©à¯à®®à®¤à®¿à®•à¯à®•à®ªà¯à®ªà®Ÿà®®à®¾à®Ÿà¯à®Ÿà®¾à®¤à¯."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr " ZIP à®•à¯‹à®ªà¯à®ªà¯ à®‰à®°à¯à®µà®¾à®•à¯à®•à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®¤à¯, à®‡à®¤à¯ à®šà®¿à®² à®¨à¯‡à®°à®®à¯ à®†à®•à®²à®¾à®®à¯."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "à®…à®Ÿà¯ˆà®µà¯ à®…à®²à¯à®²à®¤à¯ 0 bytes à® à®•à¯Šà®£à¯à®Ÿà¯à®³à¯à®³à®¤à®¾à®²à¯ à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à¯‡à®¾à®ªà¯à®ªà¯ˆ à®ªà®¤à®¿à®µà¯‡à®±à¯à®± à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®µà®´à¯"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "à®®à¯‚à®Ÿà¯à®•"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "à®¨à®¿à®²à¯à®µà¯ˆà®¯à®¿à®²à¯à®³à¯à®³"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®±à®¤à¯"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®¤à¯"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®¯à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®®à¯ à®šà¯†à®¯à®²à¯à®ªà®¾à®Ÿà¯à®Ÿà®¿à®²à¯ à®‰à®³à¯à®³à®¤à¯. à®‡à®¨à¯à®¤à®ªà¯ à®ªà®•à¯à®•à®¤à¯à®¤à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ à®µà¯†à®±à®¿à®¯à¯‡à®±à¯à®µà®¤à®¾à®©à®¤à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®¯à¯à®®à¯."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL  à®µà¯†à®±à¯à®®à¯ˆà®¯à®¾à®• à®‡à®°à¯à®•à¯à®•à®®à¯à®Ÿà®¿à®¯à®¾à®¤à¯."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ à®µà®°à¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "à®µà®°à¯à®Ÿà¯à®®à¯ à®ªà¯‹à®¤à®¾à®© à®µà®´à¯"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "à®ªà¯†à®¯à®°à¯"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "à®…à®³à®µà¯"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "à®®à®¾à®±à¯à®±à®ªà¯à®ªà®Ÿà¯à®Ÿà®¤à¯"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆà®•à®³à¯"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 à®•à¯‹à®ªà¯à®ªà¯"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{à®Žà®£à¯à®£à®¿à®•à¯à®•à¯ˆ} à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "à®•à¯‹à®ªà¯à®ªà¯ à®•à¯ˆà®¯à®¾à®³à¯à®¤à®²à¯"
@@ -270,36 +284,32 @@ msgstr "à®•à¯‹à®ªà¯à®ªà¯à®±à¯ˆ"
 msgid "From link"
 msgstr "à®‡à®£à¯ˆà®ªà¯à®ªà®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ˆ à®‡à®°à®¤à¯à®¤à¯ à®šà¯†à®¯à¯à®•"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "à®‡à®™à¯à®•à¯ à®’à®©à¯à®±à¯à®®à¯ à®‡à®²à¯à®²à¯ˆ. à®à®¤à®¾à®µà®¤à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à¯à®•!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à¯à®•"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®²à¯ à®®à®¿à®•à®ªà¯à®ªà¯†à®°à®¿à®¯à®¤à¯"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®± à®®à¯à®¯à®±à¯à®šà®¿à®•à¯à®•à¯à®®à¯ à®•à¯‹à®ªà¯à®ªà¯à®•à®³à®¾à®©à®¤à¯ à®‡à®¨à¯à®¤ à®šà¯‡à®µà¯ˆà®¯à®•à®¤à¯à®¤à®¿à®²à¯ à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®µà¯‡à®±à¯à®±à®•à¯à®•à¯‚à®Ÿà®¿à®¯ à®†à®•à®•à¯à®•à¯‚à®Ÿà®¿à®¯ à®…à®³à®µà®¿à®²à¯à®®à¯ à®•à¯‚à®Ÿà®¿à®¯à®¤à¯."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯ à®µà®°à¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®•à®¿à®©à¯à®±à®©, à®¤à®¯à®µà¯à®šà¯†à®¯à¯à®¤à¯ à®•à®¾à®¤à¯à®¤à®¿à®°à¯à®™à¯à®•à®³à¯."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "à®¤à®±à¯à®ªà¯‹à®¤à¯ à®µà®°à¯à®Ÿà®ªà¯à®ªà®Ÿà¯à®ªà®µà¯ˆ"
diff --git a/l10n/ta_LK/files_encryption.po b/l10n/ta_LK/files_encryption.po
index 2eee3be9df2803c7c0071ba71bf7b09a6fc24dfb..82cfd11914cf755e3bd2093b6b48248722f27515 100644
--- a/l10n/ta_LK/files_encryption.po
+++ b/l10n/ta_LK/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-18 00:01+0100\n"
-"PO-Revision-Date: 2012-11-17 05:33+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "à®®à®±à¯ˆà®•à¯à®•à¯à®±à®¿à®¯à¯€à®Ÿà¯"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "à®®à®±à¯ˆà®•à¯à®•à¯à®±à®¿à®¯à®¾à®•à¯à®•à®²à®¿à®²à¯ à®ªà®¿à®©à¯à®µà®°à¯à®®à¯ à®•à¯‹à®ªà¯à®ªà¯ à®µà®•à¯ˆà®•à®³à¯ˆ à®¨à¯€à®•à¯à®•à®µà¯à®®à¯"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "à®’à®©à¯à®±à¯à®®à®¿à®²à¯à®²à¯ˆ"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "à®®à®±à¯ˆà®•à¯à®•à¯à®±à®¿à®¯à®¾à®•à¯à®•à®²à¯ˆ à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
diff --git a/l10n/ta_LK/files_versions.po b/l10n/ta_LK/files_versions.po
index d1c44e0d9d0d72d07005b58f26eb19ded3652368..ed417e58282a79abf8a40396cab5c3dd7003964f 100644
--- a/l10n/ta_LK/files_versions.po
+++ b/l10n/ta_LK/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: 2012-11-20 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 08:42+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "à®Žà®²à¯à®²à®¾ à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯à®®à¯ à®•à®¾à®²à®¾à®µà®¤à®¿à®¯à®¾à®•à®¿à®µà®¿à®Ÿà¯à®Ÿà®¤à¯"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "à®µà®°à®²à®¾à®±à¯"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®•à¯‹à®ªà¯à®ªà¯à®•à¯à®•à®³à®¿à®²à¯ à®à®±à¯à®•à®©à®µà¯‡ à®‰à®³à¯à®³ à®†à®¤à®¾à®°à®¨à®•à®²à¯à®•à®³à®¿à®©à¯ à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à¯à®•à®³à¯ˆ à®‡à®µà¯ˆ à®…à®´à®¿à®¤à¯à®¤à¯à®µà®¿à®Ÿà¯à®®à¯"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "à®•à¯‹à®ªà¯à®ªà¯ à®ªà®¤à®¿à®ªà¯à®ªà¯à®•à®³à¯"
diff --git a/l10n/ta_LK/lib.po b/l10n/ta_LK/lib.po
index 804cdf565e5b16138c132e5a5174eab5c84f2f52..febb5ad3281bdbbfa305ef2cdd3aaea31f2e0600 100644
--- a/l10n/ta_LK/lib.po
+++ b/l10n/ta_LK/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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 14:16+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "à®‰à®¤à®µà®¿"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "à®¤à®©à®¿à®ªà¯à®ªà®Ÿà¯à®Ÿ"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "à®…à®®à¯ˆà®ªà¯à®ªà¯à®•à®³à¯"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "à®ªà®¯à®©à®¾à®³à®°à¯à®•à®³à¯"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "à®šà¯†à®¯à®²à®¿à®•à®³à¯"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "à®¨à®¿à®°à¯à®µà®¾à®•à®®à¯"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "à®µà¯€à®šà¯Šà®²à®¿à®ªà¯ à®ªà¯‚à®Ÿà¯à®Ÿà¯ à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à®®à¯ à®¨à®¿à®±à¯à®¤à¯à®¤à®ªà¯à®ªà®Ÿà¯à®Ÿà¯à®³à¯à®³à®¤à¯."
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯à®’à®©à¯à®±à®©à¯ à®ªà®¿à®©à¯ à®’à®©à¯à®±à®¾à®• à®ªà®¤à®¿à®µà®¿à®±à®•à¯à®•à®ªà¯à®ªà®Ÿà®µà¯‡à®£à¯à®Ÿà¯à®®à¯."
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "à®•à¯‹à®ªà¯à®ªà¯à®•à®³à¯à®•à¯à®•à¯ à®šà¯†à®²à¯à®•"
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "à®…à®¤à¯à®¤à®¾à®Ÿà¯à®šà®¿à®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à®²à®¿à®²à¯ à®µà®´à¯"
 
@@ -82,55 +86,55 @@ msgstr "à®‰à®°à¯ˆ"
 msgid "Images"
 msgstr "à®ªà®Ÿà®™à¯à®•à®³à¯"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "à®šà¯†à®•à¯à®•à®©à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 à®¨à®¿à®®à®¿à®Ÿà®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯ "
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d à®¨à®¿à®®à®¿à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d à®®à®£à®¿à®¤à¯à®¤à®¿à®¯à®¾à®²à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "à®‡à®©à¯à®±à¯"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "à®¨à¯‡à®±à¯à®±à¯"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d à®¨à®¾à®Ÿà¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®®à®¾à®¤à®®à¯"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d à®®à®¾à®¤à®¤à¯à®¤à®¿à®±à¯à®•à¯ à®®à¯à®©à¯"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "à®•à®Ÿà®¨à¯à®¤ à®µà®°à¯à®Ÿà®®à¯"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "à®µà®°à¯à®Ÿà®™à¯à®•à®³à¯à®•à¯à®•à¯ à®®à¯à®©à¯"
 
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index 841dd03141b42a5d6bd6fa423c2659095b186276..9853ea2645cfb3f94b5f42e991b5f76283ac93ac 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -88,7 +88,7 @@ msgstr "à®šà¯†à®¯à®²à®±à¯à®±à®¤à®¾à®•à¯à®•à¯à®•"
 msgid "Saving..."
 msgstr "à®‡à®¯à®²à¯à®®à¯ˆà®ªà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•"
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "_à®®à¯Šà®´à®¿_à®ªà¯†à®¯à®°à¯_"
 
@@ -100,15 +100,15 @@ msgstr "à®‰à®™à¯à®•à®³à¯à®Ÿà¯ˆà®¯ à®šà¯†à®¯à®²à®¿à®¯à¯ˆ à®šà¯‡à®°à¯à®•à¯à®•"
 msgid "More Apps"
 msgstr "à®®à¯‡à®²à®¤à®¿à®• à®šà¯†à®¯à®²à®¿à®•à®³à¯"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "à®šà¯†à®¯à®²à®¿ à®’à®©à¯à®±à¯ˆ à®¤à¯†à®°à®¿à®µà¯à®šà¯†à®¯à¯à®•"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com à®‡à®²à¯ à®šà¯†à®¯à®²à®¿ à®ªà®•à¯à®•à®¤à¯à®¤à¯ˆ à®ªà®¾à®°à¯à®•à¯à®•"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"à®…à®©à¯à®®à®¤à®¿à®ªà¯à®ªà®¤à¯à®¤à®¿à®°à®®à¯\"></span>-à®…à®©à¯à®®à®¤à®¿ à®ªà¯†à®±à¯à®± <span class=\"à®†à®šà®¿à®°à®¿à®¯à®°à¯\"></span>"
 
@@ -157,7 +157,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "à®•à®Ÿà®µà¯à®šà¯à®šà¯Šà®²à¯"
 
@@ -227,11 +227,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "à®ªà¯†à®¯à®°à¯"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "à®•à¯à®´à¯à®•à¯à®•à®³à¯"
 
@@ -243,26 +243,30 @@ msgstr "à®‰à®°à¯à®µà®¾à®•à¯à®•à¯à®•"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "à®®à®±à¯à®±à®µà¯ˆ"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "à®•à¯à®´à¯ à®¨à®¿à®°à¯à®µà®¾à®•à®¿"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "à®…à®´à®¿à®•à¯à®•"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index e98a09afa8c714a2e09f339bd44c6347e7a921b5..401d69aec015f1dc06bf3fd73d09afd4f14afa0c 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr "à®¨à¯€à®™à¯à®•à®³à¯ SSL à®šà¯‡à®µà¯ˆà®¯à¯ˆ à®¤à®µà®¿à®° à®‰à®Ÿà®©à¯
 msgid "Base DN"
 msgstr "à®¤à®³ DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "à®¨à¯€à®™à¯à®•à®³à¯ à®ªà®¯à®©à®¾à®³à®°à¯à®•à®³à¯à®•à¯à®•à¯à®®à¯ à®®à¯‡à®©à¯à®®à¯ˆ à®¤à®¤à¯à®¤à®²à®¿à®²à¯ à®‰à®³à¯à®³ à®•à¯à®´à¯à®µà®¿à®±à¯à®•à¯à®®à¯ à®¤à®³ DN à® à®•à¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿà®²à®¾à®®à¯ "
@@ -115,10 +119,18 @@ msgstr "à®¤à¯à®±à¯ˆ "
 msgid "Base User Tree"
 msgstr "à®¤à®³ à®ªà®¯à®©à®¾à®³à®°à¯ à®®à®°à®®à¯"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "à®¤à®³ à®•à¯à®´à¯ à®®à®°à®®à¯"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "à®•à¯à®´à¯ à®‰à®±à¯à®ªà¯à®ªà®¿à®©à®°à¯ à®šà®™à¯à®•à®®à¯"
diff --git a/l10n/ta_LK/user_webdavauth.po b/l10n/ta_LK/user_webdavauth.po
index b74d36a8e4390166c1a448c1e5a9115269384581..59edf0b378ace0457003d6a5442462b87a1702cf 100644
--- a/l10n/ta_LK/user_webdavauth.po
+++ b/l10n/ta_LK/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: ta_LK\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 727f555019175589a8255580e80aba3b12d33f2a..459384f62ca99f780d658896bb8c1232fe046099 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -79,59 +79,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:33
+msgid "January"
+msgstr ""
+
+#: js/config.php:33
+msgid "February"
+msgstr ""
+
+#: js/config.php:33
+msgid "March"
+msgstr ""
+
+#: js/config.php:33
+msgid "April"
+msgstr ""
+
+#: js/config.php:33
+msgid "May"
+msgstr ""
+
+#: js/config.php:33
+msgid "June"
+msgstr ""
+
+#: js/config.php:33
+msgid "July"
+msgstr ""
+
+#: js/config.php:33
+msgid "August"
+msgstr ""
+
+#: js/config.php:33
+msgid "September"
+msgstr ""
+
+#: js/config.php:33
+msgid "October"
+msgstr ""
+
+#: js/config.php:33
+msgid "November"
+msgstr ""
+
+#: js/config.php:33
+msgid "December"
+msgstr ""
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -161,8 +237,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr ""
 
@@ -174,123 +250,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -442,87 +536,11 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr ""
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr ""
 
@@ -564,17 +582,3 @@ msgstr ""
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index eda9e58013d1b6aac904ecd8f198554bf8a88e39..385f79bc971e86931574b37ebde04099a28b7476 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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"
@@ -31,46 +31,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -78,11 +78,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr ""
 
@@ -90,137 +90,151 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr ""
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr ""
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -269,36 +283,32 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ac850a6cf5ad8bd2240cec10b8a0ac4cd395bc2a..ce76225fda29e3187babe851ff1f4b42620da2bf 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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,18 +17,66 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to "
+"complete the conversion."
 msgstr ""
 
-#: templates/settings.php:6
-msgid "Enable Encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:7
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it "
+"back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
+msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 44a86d092593e7cf096755866f379f47abe46dfc..a46c86e0b65f64eb059938cc8fddd9e9ad9962b1 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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_sharing.pot b/l10n/templates/files_sharing.pot
index 9fb6d9485297469e039457a4503f4f13c2f96d19..fa7fe2782950ca4d50357b83da6130bffe4f6eb8 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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:17
+#: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
 msgstr ""
 
-#: templates/public.php:19
+#: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
 msgstr ""
 
-#: templates/public.php:22 templates/public.php:38
+#: templates/public.php:14 templates/public.php:30
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:37
+#: templates/public.php:29
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:43
+#: templates/public.php:35
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 9cbe1ef9f6e0084767d36973a26a4380cf104191..5af79d543f44032f77b2f181b322dba6c01249a5 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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,22 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 729094921d8d68de95cc71c9c90564c73a4f6de3..01f7eb678c0915929b14371ee0559f651a74734c 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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"
@@ -57,11 +57,15 @@ msgstr ""
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr ""
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 138b8fdffd9eba7e8de707cfe2cafb9c0726b15f..c07b99aab76bb17184dc8e8494ef10b7e461f98d 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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"
@@ -87,7 +87,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr ""
 
@@ -99,15 +99,15 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid ""
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
@@ -157,7 +157,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr ""
 
@@ -226,11 +226,11 @@ msgid ""
 "General Public License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr ""
 
@@ -242,26 +242,30 @@ msgstr ""
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 73eaae18c4ccdc878cfec326978d51f7bd342e98..002852e202d20c81ae51d3ed3ff005104242839e 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will "
-"not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -113,10 +117,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 24c56c17a42cc29c9f2dc35084bad8c2c531db2f..4687e50a638b6103cee22bf833aee901be219f2f 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-14 00:17+0100\n"
+"POT-Creation-Date: 2013-01-30 00:23+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,12 +17,17 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr ""
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials correct."
+"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/th_TH/core.po b/l10n/th_TH/core.po
index e36ae6f3983ca2eb6138745c01f8ce01b839a566..e218f60d9afb81051ceeebc05c5299aa967dc2c6 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 # AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -19,29 +19,29 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹„à¸Ÿà¸¥à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹„à¸Ÿà¸¥à¹Œ \"%s\" à¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“ à¹à¸¥à¸°à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹„à¸”à¹‰à¸ˆà¸²à¸à¸—à¸µà¹ˆà¸™à¸µà¹ˆ: %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ %s à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ \"%s\" à¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“ à¹à¸¥à¸°à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹„à¸”à¹‰à¸ˆà¸²à¸à¸—à¸µà¹ˆà¸™à¸µà¹ˆ: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -81,59 +81,135 @@ msgstr "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹€à¸¥à¸·à¸à¸à¸«à¸¡à¸§à¸”à¸«à¸¡à¸¹à¹ˆà¸—à¸µ
 msgid "Error removing %s from favorites."
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¥à¸š %s à¸à¸à¸à¸ˆà¸²à¸à¸£à¸²à¸¢à¸à¸²à¸£à¹‚à¸›à¸£à¸”"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "à¸§à¸±à¸™à¸à¸²à¸—à¸´à¸•à¸¢à¹Œ"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "à¸§à¸±à¸™à¸ˆà¸±à¸™à¸—à¸£à¹Œ"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "à¸§à¸±à¸™à¸à¸±à¸‡à¸„à¸²à¸£"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "à¸§à¸±à¸™à¸žà¸¸à¸˜"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "à¸§à¸±à¸™à¸žà¸¤à¸«à¸±à¸ªà¸šà¸”à¸µ"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "à¸§à¸±à¸™à¸¨à¸¸à¸à¸£à¹Œ"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "à¸§à¸±à¸™à¹€à¸ªà¸²à¸£à¹Œ"
+
+#: js/config.php:33
+msgid "January"
+msgstr "à¸¡à¸à¸£à¸²à¸„à¸¡"
+
+#: js/config.php:33
+msgid "February"
+msgstr "à¸à¸¸à¸¡à¸ à¸²à¸žà¸±à¸™à¸˜à¹Œ"
+
+#: js/config.php:33
+msgid "March"
+msgstr "à¸¡à¸µà¸™à¸²à¸„à¸¡"
+
+#: js/config.php:33
+msgid "April"
+msgstr "à¹€à¸¡à¸©à¸²à¸¢à¸™"
+
+#: js/config.php:33
+msgid "May"
+msgstr "à¸žà¸¤à¸©à¸ à¸²à¸„à¸¡"
+
+#: js/config.php:33
+msgid "June"
+msgstr "à¸¡à¸´à¸–à¸¸à¸™à¸²à¸¢à¸™"
+
+#: js/config.php:33
+msgid "July"
+msgstr "à¸à¸£à¸à¸à¸²à¸„à¸¡"
+
+#: js/config.php:33
+msgid "August"
+msgstr "à¸ªà¸´à¸‡à¸«à¸²à¸„à¸¡"
+
+#: js/config.php:33
+msgid "September"
+msgstr "à¸à¸±à¸™à¸¢à¸²à¸¢à¸™"
+
+#: js/config.php:33
+msgid "October"
+msgstr "à¸•à¸¸à¸¥à¸²à¸„à¸¡"
+
+#: js/config.php:33
+msgid "November"
+msgstr "à¸žà¸¤à¸¨à¸ˆà¸´à¸à¸²à¸¢à¸™"
+
+#: js/config.php:33
+msgid "December"
+msgstr "à¸˜à¸±à¸™à¸§à¸²à¸„à¸¡"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "à¸§à¸´à¸™à¸²à¸—à¸µ à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} à¸™à¸²à¸—à¸µà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "à¸§à¸±à¸™à¸™à¸µà¹‰"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "à¹€à¸¡à¸·à¹ˆà¸à¸§à¸²à¸™à¸™à¸µà¹‰"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{day} à¸§à¸±à¸™à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "à¹€à¸”à¸·à¸à¸™à¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} à¹€à¸”à¸·à¸à¸™à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "à¹€à¸”à¸·à¸à¸™ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "à¸›à¸µà¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "à¸›à¸µ à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
@@ -163,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "à¸žà¸šà¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”"
 
@@ -176,122 +252,140 @@ msgstr "à¸Šà¸·à¹ˆà¸à¸‚à¸à¸‡à¹à¸à¸›à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²
 msgid "The required file {file} is not installed!"
 msgstr "à¹„à¸Ÿà¸¥à¹Œ {file} à¸‹à¸¶à¹ˆà¸‡à¹€à¸›à¹‡à¸™à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸ˆà¸³à¹€à¸›à¹‡à¸™à¸•à¹‰à¸à¸‡à¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹„à¸§à¹‰à¸à¹ˆà¸à¸™ à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“ à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡ {group} à¹‚à¸”à¸¢ {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "à¸–à¸¹à¸à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸šà¸„à¸¸à¸“à¹‚à¸”à¸¢ {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "à¹à¸Šà¸£à¹Œà¹ƒà¸«à¹‰à¸à¸±à¸š"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "à¹à¸Šà¸£à¹Œà¸”à¹‰à¸§à¸¢à¸¥à¸´à¸‡à¸à¹Œ"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "à¹ƒà¸ªà¹ˆà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸§à¹‰"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
-msgstr ""
+msgstr "à¸ªà¹ˆà¸‡à¸¥à¸´à¸‡à¸à¹Œà¹ƒà¸«à¹‰à¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
-msgstr ""
+msgstr "à¸ªà¹ˆà¸‡"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "à¸à¸³à¸«à¸™à¸”à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "à¹à¸Šà¸£à¹Œà¸œà¹ˆà¸²à¸™à¸—à¸²à¸‡à¸à¸µà¹€à¸¡à¸¥"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "à¹„à¸¡à¹ˆà¸žà¸šà¸šà¸¸à¸„à¸„à¸¥à¸—à¸µà¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "à¹„à¸¡à¹ˆà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‹à¹‰à¸³à¹„à¸”à¹‰"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "à¹„à¸”à¹‰à¹à¸Šà¸£à¹Œ {item} à¹ƒà¸«à¹‰à¸à¸±à¸š {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œ"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "à¸ªà¸²à¸¡à¸²à¸£à¸–à¹à¸à¹‰à¹„à¸‚"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "à¸£à¸°à¸”à¸±à¸šà¸„à¸§à¸šà¸„à¸¸à¸¡à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "à¸ªà¸£à¹‰à¸²à¸‡"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "à¸à¸±à¸žà¹€à¸”à¸—"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "à¸¥à¸š"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "à¹à¸Šà¸£à¹Œ"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "à¹ƒà¸ªà¹ˆà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸§à¹‰"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²à¸§à¸±à¸™à¸—à¸µà¹ˆà¸«à¸¡à¸”à¸à¸²à¸¢à¸¸"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
-msgstr ""
+msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¹ˆà¸‡..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
-msgstr ""
+msgstr "à¸ªà¹ˆà¸‡à¸à¸µà¹€à¸¡à¸¥à¹Œà¹à¸¥à¹‰à¸§"
+
+#: js/update.js:14
+msgid ""
+"The update was unsuccessful. Please report this issue to the <a "
+"href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud "
+"community</a>."
+msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”à¸—à¹„à¸¡à¹ˆà¹€à¸›à¹‡à¸™à¸œà¸¥à¸ªà¸³à¹€à¸£à¹‡à¸ˆ à¸à¸£à¸¸à¸“à¸²à¹à¸ˆà¹‰à¸‡à¸›à¸±à¸à¸«à¸²à¸—à¸µà¹ˆà¹€à¸à¸´à¸”à¸‚à¸¶à¹‰à¸™à¹„à¸›à¸¢à¸±à¸‡ <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">à¸„à¸à¸¡à¸¡à¸¹à¸™à¸´à¸•à¸µà¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud</a>"
+
+#: js/update.js:18
+msgid "The update was successful. Redirecting you to ownCloud now."
+msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹€à¸”à¸—à¹€à¸ªà¸£à¹‡à¸ˆà¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§ à¸à¸³à¸¥à¸±à¸‡à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹€à¸ªà¹‰à¸™à¸—à¸²à¸‡à¹„à¸›à¸—à¸µà¹ˆ ownCloud à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸‚à¸“à¸°à¸™à¸µà¹‰"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -444,87 +538,11 @@ msgstr "Database host"
 msgid "Finish setup"
 msgstr "à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "à¸§à¸±à¸™à¸à¸²à¸—à¸´à¸•à¸¢à¹Œ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "à¸§à¸±à¸™à¸ˆà¸±à¸™à¸—à¸£à¹Œ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "à¸§à¸±à¸™à¸à¸±à¸‡à¸„à¸²à¸£"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "à¸§à¸±à¸™à¸žà¸¸à¸˜"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "à¸§à¸±à¸™à¸žà¸¤à¸«à¸±à¸ªà¸šà¸”à¸µ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "à¸§à¸±à¸™à¸¨à¸¸à¸à¸£à¹Œ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "à¸§à¸±à¸™à¹€à¸ªà¸²à¸£à¹Œ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "à¸¡à¸à¸£à¸²à¸„à¸¡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "à¸à¸¸à¸¡à¸ à¸²à¸žà¸±à¸™à¸˜à¹Œ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "à¸¡à¸µà¸™à¸²à¸„à¸¡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "à¹€à¸¡à¸©à¸²à¸¢à¸™"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "à¸žà¸¤à¸©à¸ à¸²à¸„à¸¡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "à¸¡à¸´à¸–à¸¸à¸™à¸²à¸¢à¸™"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "à¸à¸£à¸à¸à¸²à¸„à¸¡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "à¸ªà¸´à¸‡à¸«à¸²à¸„à¸¡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "à¸à¸±à¸™à¸¢à¸²à¸¢à¸™"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "à¸•à¸¸à¸¥à¸²à¸„à¸¡"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "à¸žà¸¤à¸¨à¸ˆà¸´à¸à¸²à¸¢à¸™"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "à¸˜à¸±à¸™à¸§à¸²à¸„à¸¡"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "à¸à¸à¸à¸ˆà¸²à¸à¸£à¸°à¸šà¸š"
 
@@ -565,18 +583,4 @@ msgstr "à¸–à¸±à¸”à¹„à¸›"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "à¸„à¸³à¹€à¸•à¸·à¸à¸™à¹€à¸žà¸·à¹ˆà¸à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "à¸à¸£à¸¸à¸“à¸²à¸¢à¸·à¸™à¸¢à¸±à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“ <br/> à¹€à¸žà¸·à¹ˆà¸à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢ à¸„à¸¸à¸“à¸ˆà¸°à¸–à¸¹à¸à¸‚à¸à¹ƒà¸«à¹‰à¸à¸£à¸à¸à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "à¸¢à¸·à¸™à¸¢à¸±à¸™"
+msgstr "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹€à¸”à¸— ownCloud à¹„à¸›à¹€à¸›à¹‡à¸™à¸£à¸¸à¹ˆà¸™ %s, à¸à¸£à¸¸à¸“à¸²à¸£à¸à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 290a7cebd898f55f6444fe9e36c14581e1914302..3bde97a7e04b90beb6d7eee508188f959450198f 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 # AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 17:20+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\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"
@@ -22,69 +22,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸¢à¹‰à¸²à¸¢ %s à¹„à¸”à¹‰ - à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¸Šà¸·à¹ˆà¸à¸™à¸µà¹‰à¸¡à¸µà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸¢à¹‰à¸²à¸¢ %s à¹„à¸”à¹‰"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸Šà¸·à¹ˆà¸à¹„à¸Ÿà¸¥à¹Œà¹„à¸”à¹‰"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹„à¸Ÿà¸¥à¹Œà¹ƒà¸”à¸—à¸µà¹ˆà¸–à¸¹à¸à¸à¸±à¸žà¹‚à¸«à¸¥à¸” à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸—à¸£à¸²à¸šà¸ªà¸²à¹€à¸«à¸•à¸¸"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "à¹„à¸¡à¹ˆà¸¡à¸µà¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸”à¹† à¹„à¸Ÿà¸¥à¹Œà¸–à¸¹à¸à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "à¸‚à¸™à¸²à¸”à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸¡à¸µà¸‚à¸™à¸²à¸”à¹€à¸à¸´à¸™ upload_max_filesize à¸—à¸µà¹ˆà¸£à¸°à¸šà¸¸à¹„à¸§à¹‰à¹ƒà¸™ php.ini"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸¡à¸µà¸‚à¸™à¸²à¸”à¹€à¸à¸´à¸™à¸„à¸³à¸ªà¸±à¹ˆà¸‡ MAX_FILE_SIZE à¸—à¸µà¹ˆà¸£à¸°à¸šà¸¸à¹€à¸à¸²à¹„à¸§à¹‰à¹ƒà¸™à¸£à¸¹à¸›à¹à¸šà¸šà¸„à¸³à¸ªà¸±à¹ˆà¸‡à¹ƒà¸™à¸ à¸²à¸©à¸² HTML"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸à¸¢à¹ˆà¸²à¸‡à¸ªà¸¡à¸šà¸¹à¸£à¸“à¹Œ"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸–à¸¹à¸à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£à¸Šà¸±à¹ˆà¸§à¸„à¸£à¸²à¸§à¹€à¸à¸´à¸”à¸à¸²à¸£à¸ªà¸¹à¸à¸«à¸²à¸¢"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "à¹€à¸‚à¸µà¸¢à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸¥à¸‡à¹à¸œà¹ˆà¸™à¸”à¸´à¸ªà¸à¹Œà¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr ""
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr "à¹€à¸«à¸¥à¸·à¸à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¹€à¸žà¸µà¸¢à¸‡à¸ªà¸³à¸«à¸£à¸±à¸šà¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡"
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "à¸¥à¸š"
 
@@ -92,137 +92,151 @@ msgstr "à¸¥à¸š"
 msgid "Rename"
 msgstr "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸Šà¸·à¹ˆà¸"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} à¸¡à¸µà¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§à¹ƒà¸™à¸£à¸°à¸šà¸š"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "à¹à¸—à¸™à¸—à¸µà¹ˆ"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "à¹à¸™à¸°à¸™à¸³à¸Šà¸·à¹ˆà¸"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "à¹à¸—à¸™à¸—à¸µà¹ˆ {new_name} à¹à¸¥à¹‰à¸§"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "à¹€à¸¥à¸´à¸à¸—à¸³"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "à¹à¸—à¸™à¸—à¸µà¹ˆ {new_name} à¸”à¹‰à¸§à¸¢ {old_name} à¹à¸¥à¹‰à¸§"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¹à¸Šà¸£à¹Œà¹à¸¥à¹‰à¸§ {files} à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "à¸¥à¸šà¹„à¸Ÿà¸¥à¹Œà¹à¸¥à¹‰à¸§ {files} à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' à¹€à¸›à¹‡à¸™à¸Šà¸·à¹ˆà¸à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡"
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "à¸Šà¸·à¹ˆà¸à¹„à¸Ÿà¸¥à¹Œà¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¹„à¸”à¹‰"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "à¸Šà¸·à¹ˆà¸à¸—à¸µà¹ˆà¹ƒà¸Šà¹‰à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡, '\\', '/', '<', '>', ':', '\"', '|', '?' à¹à¸¥à¸° '*' à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸£à¸±à¸šà¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¸£à¹‰à¸²à¸‡à¹„à¸Ÿà¸¥à¹Œà¸šà¸µà¸šà¸à¸±à¸” ZIP à¸à¸²à¸ˆà¹ƒà¸Šà¹‰à¹€à¸§à¸¥à¸²à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ"
+#: 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 "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸‚à¸à¸‡à¸„à¸¸à¸“à¹ƒà¸à¸¥à¹‰à¹€à¸•à¹‡à¸¡à¹à¸¥à¹‰à¸§ ({usedSpacePercent}%)"
 
-#: js/files.js:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸•à¸£à¸µà¸¢à¸¡à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¸‚à¹‰à¸à¸¡à¸¹à¸¥ à¸«à¸²à¸à¹„à¸Ÿà¸¥à¹Œà¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆ à¸à¸²à¸ˆà¹ƒà¸Šà¹‰à¹€à¸§à¸¥à¸²à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ"
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸”à¹‰ à¹€à¸™à¸·à¹ˆà¸à¸‡à¸ˆà¸²à¸à¹„à¸Ÿà¸¥à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¹€à¸›à¹‡à¸™à¹„à¸”à¹€à¸£à¹‡à¸à¸—à¸à¸£à¸µà¹ˆà¸«à¸£à¸·à¸à¸¡à¸µà¸‚à¸™à¸²à¸” 0 à¹„à¸šà¸•à¹Œ"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "à¸›à¸´à¸”"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ 1 à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "à¸à¸³à¸¥à¸±à¸‡à¸à¸±à¸žà¹‚à¸«à¸¥à¸” {count} à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸–à¸¹à¸à¸¢à¸à¹€à¸¥à¸´à¸"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œà¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£ à¸à¸²à¸£à¸à¸à¸à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¸™à¸µà¹‰à¸ˆà¸°à¸—à¸³à¹ƒà¸«à¹‰à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸–à¸¹à¸à¸¢à¸à¹€à¸¥à¸´à¸"
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸§à¹‰à¸™à¸§à¹ˆà¸²à¸‡à¹„à¸”à¹‰"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "à¸Šà¸·à¹ˆà¸à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œà¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡ à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ 'à¹à¸Šà¸£à¹Œ' à¸ªà¸‡à¸§à¸™à¹„à¸§à¹‰à¸ªà¸³à¸«à¸£à¸±à¸š Owncloud à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "à¸ªà¹à¸à¸™à¹„à¸Ÿà¸¥à¹Œà¹à¸¥à¹‰à¸§ {count} à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "à¸žà¸šà¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "à¸Šà¸·à¹ˆà¸"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "à¸‚à¸™à¸²à¸”"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "à¸›à¸£à¸±à¸šà¸›à¸£à¸¸à¸‡à¸¥à¹ˆà¸²à¸ªà¸¸à¸”"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} à¹‚à¸Ÿà¸¥à¹€à¸”à¸à¸£à¹Œ"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 à¹„à¸Ÿà¸¥à¹Œ"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} à¹„à¸Ÿà¸¥à¹Œ"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "à¸à¸²à¸£à¸ˆà¸±à¸”à¸à¸²à¹„à¸Ÿà¸¥à¹Œ"
@@ -271,36 +285,32 @@ msgstr "à¹à¸Ÿà¹‰à¸¡à¹€à¸à¸à¸ªà¸²à¸£"
 msgid "From link"
 msgstr "à¸ˆà¸²à¸à¸¥à¸´à¸‡à¸à¹Œ"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "à¸¢à¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸à¸±à¸žà¹‚à¸«à¸¥à¸”"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¸¡à¸µà¹„à¸Ÿà¸¥à¹Œà¹ƒà¸”à¹†à¸à¸¢à¸¹à¹ˆà¸—à¸µà¹ˆà¸™à¸µà¹ˆ à¸à¸£à¸¸à¸“à¸²à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸Ÿà¸¥à¹Œ!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆà¹€à¸à¸´à¸™à¹„à¸›"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸„à¸¸à¸“à¸žà¸¢à¸²à¸¢à¸²à¸¡à¸—à¸µà¹ˆà¸ˆà¸°à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¸¡à¸µà¸‚à¸™à¸²à¸”à¹€à¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸‚à¸™à¸²à¸”à¸ªà¸¹à¸‡à¸ªà¸¸à¸”à¸—à¸µà¹ˆà¸à¸³à¸«à¸™à¸”à¹„à¸§à¹‰à¹ƒà¸«à¹‰à¸à¸±à¸žà¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰à¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œà¸™à¸µà¹‰"
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸à¸³à¸¥à¸±à¸‡à¸à¸¢à¸¹à¹ˆà¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¸à¸²à¸£à¸ªà¹à¸à¸™, à¸à¸£à¸¸à¸“à¸²à¸£à¸à¸ªà¸±à¸à¸„à¸£à¸¹à¹ˆ."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¸à¸³à¸¥à¸±à¸‡à¸ªà¹à¸à¸™à¸à¸¢à¸¹à¹ˆà¸‚à¸“à¸°à¸™à¸µà¹‰"
diff --git a/l10n/th_TH/files_encryption.po b/l10n/th_TH/files_encryption.po
index f396eed4dab79d6abc0bb8d74189bc3b91b29ac4..e76ad6347f85811e6705190fb3bb676348fd11aa 100644
--- a/l10n/th_TH/files_encryption.po
+++ b/l10n/th_TH/files_encryption.po
@@ -3,33 +3,81 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-15 02:02+0200\n"
-"PO-Revision-Date: 2012-08-14 13:12+0000\n"
+"POT-Creation-Date: 2013-01-24 00:06+0100\n"
+"PO-Revision-Date: 2013-01-23 15:03+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "à¸à¸£à¸¸à¸“à¸²à¸ªà¸¥à¸±à¸šà¹„à¸›à¸—à¸µà¹ˆà¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œ ownCloud à¸‚à¸à¸‡à¸„à¸¸à¸“ à¹à¸¥à¹‰à¸§à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹€à¸žà¸·à¹ˆà¸à¹à¸›à¸¥à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸«à¹‰à¹€à¸ªà¸£à¹‡à¸ˆà¸ªà¸¡à¸šà¸¹à¸£à¸“à¹Œ"
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "à¸ªà¸¥à¸±à¸šà¹„à¸›à¹ƒà¸Šà¹‰à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸ˆà¸²à¸à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œ"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹„à¸›à¹€à¸›à¹‡à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸š"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "à¸à¸£à¸¸à¸“à¸²à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¹à¸¥à¹‰à¸§à¸¥à¸à¸‡à¹ƒà¸«à¸¡à¹ˆà¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡"
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸›à¹€à¸›à¹‡à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸ªà¸¹à¹ˆà¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸”à¹‰"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "à¹€à¸¥à¸·à¸à¸à¸£à¸¹à¸›à¹à¸šà¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª:"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸”à¹‰à¸§à¸¢à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œ (à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸—à¸µà¹ˆà¸ªà¸¸à¸” à¹à¸•à¹ˆà¸ˆà¸°à¸—à¸³à¹ƒà¸«à¹‰à¸„à¸¸à¸“à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸•à¹ˆà¸²à¸‡à¹†à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¸ˆà¸à¹€à¸§à¹‡à¸šà¹„à¸‹à¸•à¹Œà¹„à¸”à¹‰)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¸ˆà¸²à¸à¸—à¸²à¸‡à¸à¸±à¹ˆà¸‡à¹€à¸‹à¸´à¸£à¹Œà¸Ÿà¹€à¸§à¸à¸£à¹Œ (à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸„à¸¸à¸“à¹€à¸‚à¹‰à¸²à¸–à¸¶à¸‡à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¸ˆà¸²à¸à¸«à¸™à¹‰à¸²à¸ˆà¸à¹€à¸§à¹‡à¸šà¹„à¸‹à¸•à¹Œ à¹à¸¥à¸°à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œà¸ˆà¸²à¸à¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¹€à¸”à¸ªà¸à¹Œà¸—à¹‡à¸à¸›à¹„à¸”à¹‰)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡ (à¹„à¸¡à¹ˆà¸¡à¸µà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹€à¸¥à¸¢)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡à¸ªà¸³à¸„à¸±à¸: à¸«à¸¥à¸±à¸‡à¸ˆà¸²à¸à¸—à¸µà¹ˆà¸„à¸¸à¸“à¹„à¸”à¹‰à¹€à¸¥à¸·à¸à¸à¸£à¸¹à¸›à¹à¸šà¸šà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ªà¹à¸¥à¹‰à¸§ à¸ˆà¸°à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸à¸¥à¸±à¸šà¸¡à¸²à¹ƒà¸«à¸¡à¹ˆà¹„à¸”à¹‰à¸à¸µà¸"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹€à¸¥à¸·à¸à¸à¹€à¸à¸‡ (à¸›à¸¥à¹ˆà¸à¸¢à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸•à¸±à¸”à¸ªà¸´à¸™à¹ƒà¸ˆà¹€à¸à¸‡)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡à¸£à¸§à¸¡à¸Šà¸™à¸´à¸”à¸‚à¸à¸‡à¹„à¸Ÿà¸¥à¹Œà¸”à¸±à¸‡à¸•à¹ˆà¸à¹„à¸›à¸™à¸µà¹‰à¸ˆà¸²à¸à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "à¹„à¸¡à¹ˆà¸•à¹‰à¸à¸‡"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¸£à¸«à¸±à¸ª"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index efca59c6be08440d8d2c02f181e253843da13804..6d58bbeaf8134cf2f2a86921d3405f582df523b5 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 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-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 00:50+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\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"
@@ -46,14 +46,14 @@ msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> \"smbclient\" à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡. à¸à¸²à¸£à¸Šà¸µà¹‰ CIFS/SMB à¹€à¸žà¸·à¹ˆà¸à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸£à¸°à¸—à¸³à¹„à¸”à¹‰ à¸à¸£à¸¸à¸“à¸²à¸ªà¸à¸šà¸–à¸²à¸¡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¸à¸²à¸£à¸ªà¸™à¸±à¸šà¸ªà¸™à¸¸à¸™à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ FTP à¹ƒà¸™à¸ à¸²à¸©à¸² PHP à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸«à¸£à¸·à¸à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡. à¸à¸²à¸£à¸Šà¸µà¹‰ FTP à¹€à¸žà¸·à¹ˆà¸à¹à¸Šà¸£à¹Œà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸³à¹€à¸™à¸´à¸™à¸à¸²à¸£à¹„à¸”à¹‰ à¸à¸£à¸¸à¸“à¸²à¸ªà¸à¸šà¸–à¸²à¸¡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡à¸ˆà¸²à¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡"
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -100,7 +100,7 @@ msgid "Users"
 msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
 #: templates/settings.php:108 templates/settings.php:109
-#: templates/settings.php:149 templates/settings.php:150
+#: templates/settings.php:144 templates/settings.php:145
 msgid "Delete"
 msgstr "à¸¥à¸š"
 
@@ -112,10 +112,10 @@ msgstr "à¹€à¸›à¸´à¸”à¹ƒà¸«à¹‰à¸¡à¸µà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±
 msgid "Allow users to mount their own external storage"
 msgstr "à¸à¸™à¸¸à¸à¸²à¸•à¹ƒà¸«à¹‰à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸²à¸¡à¸²à¸£à¸–à¸Šà¸µà¹‰à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡à¹„à¸›à¸—à¸µà¹ˆà¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸ à¸²à¸¢à¸™à¸à¸à¸‚à¸à¸‡à¸•à¸™à¹€à¸à¸‡à¹„à¸”à¹‰"
 
-#: templates/settings.php:139
+#: templates/settings.php:136
 msgid "SSL root certificates"
 msgstr "à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸”à¹‰à¸§à¸¢à¸£à¸°à¸šà¸š SSL à¸ˆà¸²à¸ Root"
 
-#: templates/settings.php:158
+#: templates/settings.php:153
 msgid "Import Root Certificate"
 msgstr "à¸™à¸³à¹€à¸‚à¹‰à¸²à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹ƒà¸šà¸£à¸±à¸šà¸£à¸à¸‡à¸„à¸§à¸²à¸¡à¸›à¸¥à¸à¸”à¸ à¸±à¸¢à¸ˆà¸²à¸ Root"
diff --git a/l10n/th_TH/files_versions.po b/l10n/th_TH/files_versions.po
index 7582be9f673c76dba444ee72bccc465a21cfc68e..c36c1b5941bc5d8a1aa17fca875257c953bf796a 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/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: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 11:09+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+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,22 +18,10 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¸—à¸¸à¸à¸£à¸¸à¹ˆà¸™"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "à¸›à¸£à¸°à¸§à¸±à¸•à¸´"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "à¸£à¸¸à¹ˆà¸™"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "à¸™à¸µà¹ˆà¸ˆà¸°à¹€à¸›à¹‡à¸™à¸¥à¸šà¸—à¸´à¹‰à¸‡à¹„à¸Ÿà¸¥à¹Œà¸£à¸¸à¹ˆà¸™à¸—à¸µà¹ˆà¸—à¸³à¸à¸²à¸£à¸ªà¸³à¸£à¸à¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸—à¸µà¹ˆà¸¡à¸µà¸à¸¢à¸¹à¹ˆà¸‚à¸à¸‡à¸„à¸¸à¸“à¸—à¸´à¹‰à¸‡à¹„à¸›"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "à¸à¸²à¸£à¸à¸³à¸«à¸™à¸”à¹€à¸§à¸à¸£à¹Œà¸Šà¸±à¹ˆà¸™à¸‚à¸à¸‡à¹„à¸Ÿà¸¥à¹Œ"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 93bec7510e542537c4785d4d8ebad9d7a05d472e..ab2e313276249719ed72b63e2e6ba36663245257 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.po
@@ -3,13 +3,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-23 00:01+0100\n"
-"PO-Revision-Date: 2012-11-22 10:45+0000\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 00:44+0000\n"
 "Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "à¸Šà¹ˆà¸§à¸¢à¹€à¸«à¸¥à¸·à¸"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "à¸ªà¹ˆà¸§à¸™à¸•à¸±à¸§"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "à¸•à¸±à¹‰à¸‡à¸„à¹ˆà¸²"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "à¹à¸à¸›à¸¯"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "à¸„à¸¸à¸“à¸ªà¸¡à¸šà¸±à¸•à¸´à¸à¸²à¸£à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸” zip à¸–à¸¹à¸à¸›à¸´à¸”à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸§à¹‰"
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰à¸—à¸µà¸¥à¸°à¸„à¸£à¸±à¹‰à¸‡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™"
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "à¸à¸¥à¸±à¸šà¹„à¸›à¸—à¸µà¹ˆà¹„à¸Ÿà¸¥à¹Œ"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¹€à¸¥à¸·à¸à¸à¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆà¹€à¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸—à¸µà¹ˆà¸ˆà¸°à¸ªà¸£à¹‰à¸²à¸‡à¹€à¸›à¹‡à¸™à¹„à¸Ÿà¸¥à¹Œ zip"
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸³à¸«à¸™à¸”à¹„à¸”à¹‰"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "à¹à¸à¸žà¸žà¸¥à¸´à¹€à¸„à¸Šà¸±à¹ˆà¸™à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
@@ -82,55 +86,55 @@ msgstr "à¸‚à¹‰à¸à¸„à¸§à¸²à¸¡"
 msgid "Images"
 msgstr "à¸£à¸¹à¸›à¸ à¸²à¸ž"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "à¸§à¸´à¸™à¸²à¸—à¸µà¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 à¸™à¸²à¸—à¸µà¸¡à¸²à¹à¸¥à¹‰à¸§"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d à¸™à¸²à¸—à¸µà¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d à¸Šà¸±à¹ˆà¸§à¹‚à¸¡à¸‡à¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²à¸™à¸µà¹‰"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "à¸§à¸±à¸™à¸™à¸µà¹‰"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "à¹€à¸¡à¸·à¹ˆà¸à¸§à¸²à¸™à¸™à¸µà¹‰"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d à¸§à¸±à¸™à¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "à¹€à¸”à¸·à¸à¸™à¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d à¹€à¸”à¸·à¸à¸™à¸¡à¸²à¹à¸¥à¹‰à¸§"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "à¸›à¸µà¸—à¸µà¹ˆà¹à¸¥à¹‰à¸§"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "à¸›à¸µà¸—à¸µà¹ˆà¸œà¹ˆà¸²à¸™à¸¡à¸²"
 
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index a024b5901ae9d23cacd52422232f58bb86568e26..238a91cd1dc3934606949449e3a3d440477ba03d 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 # AriesAnywhere Anywhere <ariesanywherer@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -66,7 +66,7 @@ msgstr "à¸„à¸³à¸£à¹‰à¸à¸‡à¸‚à¸à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸¥à¸šà¸•à¸±à¸§à¹€à¸à¸‡à¸à¸à¸à¸ˆà¸²à¸à¸à¸¥à¸¸à¹ˆà¸¡à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¹„à¸”à¹‰"
 
 #: ajax/togglegroups.php:28
 #, php-format
@@ -90,7 +90,7 @@ msgstr "à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 msgid "Saving..."
 msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—à¸¶à¸¸à¸à¸‚à¹‰à¸à¸¡à¸¹à¸¥..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "à¸ à¸²à¸©à¸²à¹„à¸—à¸¢"
 
@@ -102,41 +102,41 @@ msgstr "à¹€à¸žà¸´à¹ˆà¸¡à¹à¸à¸›à¸‚à¸à¸‡à¸„à¸¸à¸“"
 msgid "More Apps"
 msgstr "à¹à¸à¸›à¸¯à¸à¸·à¹ˆà¸™à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸•à¸´à¸¡"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "à¹€à¸¥à¸·à¸à¸ App"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "à¸”à¸¹à¸«à¸™à¹‰à¸²à¹à¸à¸žà¸žà¸¥à¸´à¹€à¸„à¸Šà¸±à¹ˆà¸™à¸—à¸µà¹ˆ apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹‚à¸”à¸¢ <span class=\"author\"></span>"
 
 #: templates/help.php:3
 msgid "User Documentation"
-msgstr ""
+msgstr "à¹€à¸à¸à¸ªà¸²à¸£à¸„à¸¹à¹ˆà¸¡à¸·à¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™"
 
 #: templates/help.php:4
 msgid "Administrator Documentation"
-msgstr ""
+msgstr "à¹€à¸à¸à¸ªà¸²à¸£à¸„à¸¹à¹ˆà¸¡à¸·à¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸š"
 
 #: templates/help.php:6
 msgid "Online Documentation"
-msgstr ""
+msgstr "à¹€à¸à¸à¸ªà¸²à¸£à¸„à¸¹à¹ˆà¸¡à¸·à¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸à¸™à¹„à¸¥à¸™à¹Œ"
 
 #: templates/help.php:7
 msgid "Forum"
-msgstr ""
+msgstr "à¸à¸£à¸°à¸”à¸²à¸™à¸ªà¸™à¸—à¸™à¸²"
 
 #: templates/help.php:9
 msgid "Bugtracker"
-msgstr ""
+msgstr "Bugtracker"
 
 #: templates/help.php:11
 msgid "Commercial Support"
-msgstr ""
+msgstr "à¸šà¸£à¸´à¸à¸²à¸£à¸¥à¸¹à¸à¸„à¹‰à¸²à¹à¸šà¸šà¹€à¸ªà¸µà¸¢à¸„à¹ˆà¸²à¹ƒà¸Šà¹‰à¸ˆà¹ˆà¸²à¸¢"
 
 #: templates/personal.php:8
 #, php-format
@@ -149,17 +149,17 @@ msgstr "à¸¥à¸¹à¸à¸„à¹‰à¸²"
 
 #: templates/personal.php:13
 msgid "Download Desktop Clients"
-msgstr ""
+msgstr "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œà¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¹€à¸”à¸ªà¸à¹Œà¸—à¹‡à¸à¸›"
 
 #: templates/personal.php:14
 msgid "Download Android Client"
-msgstr ""
+msgstr "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œà¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸à¸™à¸”à¸£à¸à¸¢à¸”à¹Œ"
 
 #: templates/personal.php:15
 msgid "Download iOS Client"
-msgstr ""
+msgstr "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œà¸ªà¸³à¸«à¸£à¸±à¸š iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™"
 
@@ -209,15 +209,15 @@ msgstr "à¸Šà¹ˆà¸§à¸¢à¸à¸±à¸™à¹à¸›à¸¥"
 
 #: templates/personal.php:52
 msgid "WebDAV"
-msgstr ""
+msgstr "WebDAV"
 
 #: templates/personal.php:54
 msgid "Use this address to connect to your ownCloud in your file manager"
-msgstr ""
+msgstr "à¹ƒà¸Šà¹‰à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸à¸±à¸š ownCloud à¹ƒà¸™à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¸ˆà¸±à¸”à¸à¸²à¸£à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“"
 
 #: templates/personal.php:63
 msgid "Version"
-msgstr ""
+msgstr "à¸£à¸¸à¹ˆà¸™"
 
 #: templates/personal.php:65
 msgid ""
@@ -229,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "à¸Šà¸·à¹ˆà¸"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "à¸à¸¥à¸¸à¹ˆà¸¡"
 
@@ -243,28 +243,32 @@ msgstr "à¸ªà¸£à¹‰à¸²à¸‡"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸³à¸à¸±à¸”à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "à¹„à¸¡à¹ˆà¸ˆà¸³à¸à¸±à¸”à¸ˆà¸³à¸™à¸§à¸™"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "à¸à¸·à¹ˆà¸™à¹†"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "à¸„à¹ˆà¸²à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "à¸¥à¸š"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index c8a7bd651bd7ede9f52ddb669b5dbacdd53f273d..bb0c9b64412ab291911c4ef6600fd63f91e09bf6 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 01:21+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\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"
@@ -23,13 +23,13 @@ msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behaviour. Please ask your system administrator to "
 "disable one of them."
-msgstr ""
+msgstr "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¹à¸à¸›à¸¯ user_ldap à¹à¸¥à¸° user_webdavauth à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸£à¹ˆà¸§à¸¡à¸à¸±à¸™à¹„à¸”à¹‰. à¸„à¸¸à¸“à¸à¸²à¸ˆà¸›à¸£à¸°à¸ªà¸žà¸›à¸±à¸à¸«à¸²à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸„à¸²à¸”à¸„à¸´à¸”à¸ˆà¸²à¸à¹€à¸«à¸•à¸¸à¸à¸²à¸£à¸“à¹Œà¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§ à¸à¸£à¸¸à¸“à¸²à¸•à¸´à¸”à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸£à¸°à¸‡à¸±à¸šà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸à¸›à¸¯ à¸•à¸±à¸§à¹ƒà¸”à¸•à¸±à¸§à¸«à¸™à¸¶à¹ˆà¸‡à¸‚à¹‰à¸²à¸‡à¸•à¹‰à¸™"
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr ""
+"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
+"work. Please ask your system administrator to install it."
+msgstr "<b>à¸„à¸³à¹€à¸•à¸·à¸à¸™:</b> à¹‚à¸¡à¸”à¸¹à¸¥ PHP LDAP à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¸–à¸¹à¸à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡, à¸£à¸°à¸šà¸šà¸”à¹‰à¸²à¸™à¸«à¸¥à¸±à¸‡à¸ˆà¸°à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸—à¸³à¸‡à¸²à¸™à¹„à¸”à¹‰ à¸à¸£à¸¸à¸“à¸²à¸•à¸´à¸”à¸•à¹ˆà¸à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¸—à¸³à¸à¸²à¸£à¸•à¸´à¸”à¸•à¸±à¹‰à¸‡à¹‚à¸¡à¸”à¸¹à¸¥à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§"
 
 #: templates/settings.php:15
 msgid "Host"
@@ -44,6 +44,10 @@ msgstr "à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸›à¸¥à¹ˆà¸à¸¢à¸Šà¹ˆà¸à¸‡à¹‚à¸›à¸£à¹‚à¸•à¸„
 msgid "Base DN"
 msgstr "DN à¸à¸²à¸™"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr "à¸«à¸™à¸¶à¹ˆà¸‡ Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”"
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "à¸„à¸¸à¸“à¸ªà¸²à¸¡à¸²à¸£à¸–à¸£à¸°à¸šà¸¸ DN à¸«à¸¥à¸±à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹à¸¥à¸°à¸à¸¥à¸¸à¹ˆà¸¡à¸•à¹ˆà¸²à¸‡à¹†à¹ƒà¸™à¹à¸—à¹‡à¸šà¸‚à¸±à¹‰à¸™à¸ªà¸¹à¸‡à¹„à¸”à¹‰"
@@ -115,10 +119,18 @@ msgstr "à¸žà¸à¸£à¹Œà¸•"
 msgid "Base User Tree"
 msgstr "à¸£à¸²à¸¢à¸à¸²à¸£à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr "à¸«à¸™à¸¶à¹ˆà¸‡ User Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”"
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "à¸£à¸²à¸¢à¸à¸²à¸£à¸à¸¥à¸¸à¹ˆà¸¡à¸«à¸¥à¸±à¸à¹à¸šà¸š Tree"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr "à¸«à¸™à¸¶à¹ˆà¸‡ Group Base DN à¸•à¹ˆà¸à¸šà¸£à¸£à¸—à¸±à¸”"
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "à¸„à¸§à¸²à¸¡à¸ªà¸±à¸¡à¸žà¸±à¸™à¸˜à¹Œà¸‚à¸à¸‡à¸ªà¸¡à¸²à¸Šà¸´à¸à¹ƒà¸™à¸à¸¥à¸¸à¹ˆà¸¡"
diff --git a/l10n/th_TH/user_webdavauth.po b/l10n/th_TH/user_webdavauth.po
index e169eac8418f4f78ca93234313a6b21af6644355..3493831b2c1f7084a9e3ea50b006b5c15877bea4 100644
--- a/l10n/th_TH/user_webdavauth.po
+++ b/l10n/th_TH/user_webdavauth.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012.
+# AriesAnywhere Anywhere <ariesanywhere@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 00:54+0000\n"
+"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
 "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,13 +18,17 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV Authentication"
+
 #: templates/settings.php:4
 msgid "URL: http://"
-msgstr ""
+msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud à¸ˆà¸°à¸ªà¹ˆà¸‡à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸‚à¸à¸‡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸›à¸¢à¸±à¸‡à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆ URL à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸™à¸µà¹‰ à¸›à¸¥à¸±à¹Šà¸à¸à¸´à¸™à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¸•à¸£à¸§à¸ˆà¸ªà¸à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸—à¸µà¹ˆà¹‚à¸•à¹‰à¸•à¸à¸šà¸à¸¥à¸±à¸šà¸¡à¸²à¹à¸¥à¸°à¸ˆà¸°à¸—à¸³à¸à¸²à¸£à¹à¸›à¸¥à¸£à¸«à¸±à¸ª HTTP statuscodes 401 à¹à¸¥à¸° 403 à¹ƒà¸«à¹‰à¹€à¸›à¹‡à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰ à¸ªà¹ˆà¸§à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸·à¹ˆà¸™à¹†à¸—à¸µà¹ˆà¹€à¸«à¸¥à¸·à¸à¸—à¸±à¹‰à¸‡à¸«à¸¡à¸”à¸ˆà¸°à¹€à¸›à¹‡à¸™à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 0057c9b5064efaba06c8357ef97a8921e85142b7..1f3b9f92bc36d59fdaefcc9ecec9966e15710462 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -6,13 +6,14 @@
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
 # Caner BaÅŸaran <basaran.caner@gmail.com>, 2012.
 #   <info@beyboo.de>, 2012.
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
 # Necdet YÃ¼cel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,29 +22,29 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "%s kullanÄ±cÄ±sÄ± sizinle bir dosyayÄ± paylaÅŸtÄ±"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "%s kullanÄ±cÄ±sÄ± sizinle bir dizini paylaÅŸtÄ±"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "%s kullanÄ±cÄ±sÄ± \"%s\" dosyasÄ±nÄ± sizinle paylaÅŸtÄ±. %s adresinden indirilebilir"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "%s kullanÄ±cÄ±sÄ± \"%s\" dizinini sizinle paylaÅŸtÄ±. %s adresinden indirilebilir"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -67,12 +68,12 @@ msgstr "Nesne tÃ¼rÃ¼ desteklenmemektedir."
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID belirtilmedi."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "%s favorilere eklenirken hata oluÅŸtu"
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -81,61 +82,137 @@ msgstr "Silmek iÃ§in bir kategori seÃ§ilmedi"
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "%s favorilere Ã§Ä±karÄ±lÄ±rken hata oluÅŸtu"
+
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Pazar"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Pazartesi"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "SalÄ±"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Ã‡arÅŸamba"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Thursday"
+msgstr "PerÅŸembe"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Cuma"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Cumartesi"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Ocak"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Åžubat"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Mart"
+
+#: js/config.php:33
+msgid "April"
+msgstr "Nisan"
+
+#: js/config.php:33
+msgid "May"
+msgstr "MayÄ±s"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Haziran"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Temmuz"
+
+#: js/config.php:33
+msgid "August"
+msgstr "AÄŸustos"
+
+#: js/config.php:33
+msgid "September"
+msgstr "EylÃ¼l"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Ekim"
+
+#: js/config.php:33
+msgid "November"
+msgstr "KasÄ±m"
+
+#: js/config.php:33
+msgid "December"
+msgstr "AralÄ±k"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "saniye Ã¶nce"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 dakika Ã¶nce"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} dakika Ã¶nce"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 saat Ã¶nce"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} saat Ã¶nce"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "bugÃ¼n"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "dÃ¼n"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} gÃ¼n Ã¶nce"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "geÃ§en ay"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} ay Ã¶nce"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "ay Ã¶nce"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "geÃ§en yÄ±l"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "yÄ±l Ã¶nce"
 
@@ -165,136 +242,154 @@ msgid "The object type is not specified."
 msgstr "Nesne tÃ¼rÃ¼ belirtilmemiÅŸ."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Hata"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "uygulama adÄ± belirtilmedi."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
+msgstr "Ä°htiyaÃ§ duyulan {file} dosyasÄ± kurulu deÄŸil."
+
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Share"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: js/share.js:29 js/share.js:43 js/share.js:90 js/share.js:93
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "PaylaÅŸÄ±m sÄ±rasÄ±nda hata  "
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
-msgstr ""
+msgstr "PaylaÅŸÄ±m iptal ediliyorken hata"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Ä°zinleri deÄŸiÅŸtirirken hata oluÅŸtu"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr " {owner} tarafÄ±ndan sizinle ve {group} ile paylaÅŸtÄ±rÄ±lmÄ±ÅŸ"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "{owner} trafÄ±ndan sizinle paylaÅŸtÄ±rÄ±ldÄ±"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "ile PaylaÅŸ"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "BaÄŸlantÄ± ile paylaÅŸ"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Åžifre korunmasÄ±"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Parola"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
-msgstr ""
+msgstr "KiÅŸiye e-posta linki"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "GÃ¶nder"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Son kullanma tarihini ayarla"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Son kullanÄ±m tarihi"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Eposta ile paylaÅŸ"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "KiÅŸi bulunamadÄ±"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Tekrar paylaÅŸmaya izin verilmiyor"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr " {item} iÃ§inde  {user} ile paylaÅŸÄ±lanlarlar"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "PaylaÅŸÄ±lmayan"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "dÃ¼zenleyebilir"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "eriÅŸim kontrolÃ¼"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "oluÅŸtur"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "gÃ¼ncelle"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "sil"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "paylaÅŸ"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Paralo korumalÄ±"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "GeÃ§erlilik tarihi tanÄ±mlama kaldÄ±rma hatasÄ±"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "GeÃ§erlilik tarihi tanÄ±mlama hatasÄ±"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "GÃ¶nderiliyor..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Eposta gÃ¶nderildi"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud parola sÄ±fÄ±rlama"
@@ -384,13 +479,13 @@ msgstr "GÃ¼venlik Uyarisi"
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "GÃ¼venli rasgele sayÄ± Ã¼reticisi bulunamadÄ±. LÃ¼tfen PHP OpenSSL eklentisini etkinleÅŸtirin."
 
 #: 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 ""
+msgstr "GÃ¼venli rasgele sayÄ± Ã¼reticisi olmadan saldÄ±rganlar parola sÄ±fÄ±rlama simgelerini tahmin edip hesabÄ±nÄ±zÄ± ele geÃ§irebilir."
 
 #: templates/installation.php:32
 msgid ""
@@ -399,7 +494,7 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr ""
+msgstr "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."
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
@@ -446,87 +541,11 @@ msgstr "VeritabanÄ± sunucusu"
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Pazar"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Pazartesi"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "SalÄ±"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Ã‡arÅŸamba"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "PerÅŸembe"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Cuma"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Cumartesi"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Ocak"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Åžubat"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Mart"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "Nisan"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "MayÄ±s"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Haziran"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Temmuz"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "AÄŸustos"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "EylÃ¼l"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Ekim"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "KasÄ±m"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "AralÄ±k"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "kontrolÃ¼nÃ¼zdeki web servisleri"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Ã‡Ä±kÄ±ÅŸ yap"
 
@@ -538,11 +557,11 @@ msgstr "Otomatik oturum aÃ§ma reddedildi!"
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "YakÄ±n zamanda parolanÄ±zÄ± deÄŸiÅŸtirmedi iseniz hesabÄ±nÄ±z riske girebilir."
 
 #: templates/login.php:13
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "HesabÄ±nÄ±zÄ± korumak iÃ§in lÃ¼tfen parolanÄ±zÄ± deÄŸiÅŸtirin."
 
 #: templates/login.php:19
 msgid "Lost your password?"
@@ -567,18 +586,4 @@ msgstr "sonraki"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "GÃ¼venlik UyarÄ±sÄ±!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "DoÄŸrula"
+msgstr "Owncloud %s versiyonuna gÃ¼ncelleniyor. Biraz zaman alabilir."
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 641b6c26f928656539eba79fef2be3f7d632cc19..c6e1b108a7c2ba7c4f8f68201272a9fb874073f5 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -7,13 +7,14 @@
 # Caner BaÅŸaran <basaran.caner@gmail.com>, 2012.
 # Emre  <emresaracoglu@live.com>, 2012.
 #   <info@beyboo.de>, 2012.
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
 # Necdet YÃ¼cel <necdetyucel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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,69 +26,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "%s taÅŸÄ±namadÄ±. Bu isimde dosya zaten var."
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "%s taÅŸÄ±namadÄ±"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "Dosya adÄ± deÄŸiÅŸtirilemedi"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "Dosya yÃ¼klenmedi. Bilinmeyen hata"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Bir hata yok, dosya baÅŸarÄ±yla yÃ¼klendi"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "php.ini dosyasÄ±nda upload_max_filesize ile belirtilen dosya yÃ¼kleme sÄ±nÄ±rÄ± aÅŸÄ±ldÄ±."
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "YÃ¼klenen dosya HTML formundaki MAX_FILE_SIZE sÄ±nÄ±rÄ±nÄ± aÅŸÄ±yor"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "YÃ¼klenen dosyanÄ±n sadece bir kÄ±smÄ± yÃ¼klendi"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "HiÃ§ dosya yÃ¼klenmedi"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "GeÃ§ici bir klasÃ¶r eksik"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "Diske yazÄ±lamadÄ±"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "GeÃ§ersiz dizin."
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "Dosyalar"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "PaylaÅŸÄ±lmayan"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Sil"
 
@@ -95,137 +96,151 @@ msgstr "Sil"
 msgid "Rename"
 msgstr "Ä°sim deÄŸiÅŸtir."
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} zaten mevcut"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "deÄŸiÅŸtir"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Ã–neri ad"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "deÄŸiÅŸtirilen {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "{new_name} ismi {old_name} ile deÄŸiÅŸtirildi"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "paylaÅŸÄ±lmamÄ±ÅŸ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "silinen {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' geÃ§ersiz dosya adÄ±."
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "Dosya adÄ± boÅŸ olamaz."
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "GeÃ§ersiz isim, '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ZIP dosyasÄ± oluÅŸturuluyor, biraz sÃ¼rebilir."
+#: 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:224
+#: js/files.js:219
+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:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "YÃ¼kleme hatasÄ±"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Kapat"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 dosya yÃ¼klendi"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} dosya yÃ¼kleniyor"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "YÃ¼kleme iptal edildi."
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL boÅŸ olamaz."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "GeÃ§ersiz dizin adÄ±. Shared isminin kullanÄ±mÄ± Owncloud tarafÄ±ndan rezerver edilmiÅŸtir."
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} dosya tarandÄ±"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "tararamada hata oluÅŸdu"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ad"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "DeÄŸiÅŸtirilme"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 dizin"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} dizin"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 dosya"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} dosya"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "YÃ¼kle"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Dosya taÅŸÄ±ma"
@@ -274,36 +289,32 @@ msgstr "KlasÃ¶r"
 msgid "From link"
 msgstr "BaÄŸlantÄ±dan"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "YÃ¼kle"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "YÃ¼klemeyi iptal et"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiÃ§bir ÅŸey yok. BirÅŸeyler yÃ¼kleyin!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Ä°ndir"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "YÃ¼klemeniz Ã§ok bÃ¼yÃ¼k"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranÄ±yor, lÃ¼tfen bekleyin."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "GÃ¼ncel tarama"
diff --git a/l10n/tr/files_encryption.po b/l10n/tr/files_encryption.po
index c48e3908ae64eb1f71bf9d2b079ca486bef43caf..e95281ce029c8e62754012a31fb6113a12acca47 100644
--- a/l10n/tr/files_encryption.po
+++ b/l10n/tr/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 10:35+0000\n"
-"Last-Translator: Necdet YÃ¼cel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Åžifreleme"
 
-#: templates/settings.php:6
-msgid "Enable Encryption"
-msgstr "Åžifrelemeyi EtkinleÅŸtir"
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr "AÅŸaÄŸÄ±daki dosya tiplerini ÅŸifrelemeye dahil etme"
 
-#: templates/settings.php:7
+#: templates/settings.php:71
 msgid "None"
 msgstr "HiÃ§biri"
-
-#: templates/settings.php:12
-msgid "Exclude the following file types from encryption"
-msgstr "AÅŸaÄŸÄ±daki dosya tiplerini ÅŸifrelemeye dahil etme"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 1d3dff15348dbe2d71c4c28f9d20a760a0b00a5e..6f30f6794a29d302318fde4055b0a63fa46cc823 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/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: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 09:24+0000\n"
-"Last-Translator: Necdet YÃ¼cel <necdetyucel@gmail.com>\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"
 "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,22 +18,10 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:7
-msgid "Expire all versions"
-msgstr "TÃ¼m sÃ¼rÃ¼mleri sona erdir"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "GeÃ§miÅŸ"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "SÃ¼rÃ¼mler"
-
-#: templates/settings-personal.php:10
-msgid "This will delete all existing backup versions of your files"
-msgstr "Bu dosyalarÄ±nÄ±zÄ±n tÃ¼m yedek sÃ¼rÃ¼mlerini silecektir"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Dosya SÃ¼rÃ¼mleri"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index 66590bc8eb0762bef9401be6430d5571df57eb5c..fadb1957cfb9b793a789489d08c230d7c6e53822 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ismail yenigul <ismail.yenigul@surgate.com>, 2013.
 # Necdet YÃ¼cel <necdetyucel@gmail.com>, 2012.
 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 11:03+0000\n"
-"Last-Translator: Necdet YÃ¼cel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 09:28+0000\n"
+"Last-Translator: ismail yenigÃ¼l <ismail.yenigul@surgate.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,27 +19,27 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:287
+#: app.php:301
 msgid "Help"
 msgstr "YardÄ±"
 
-#: app.php:294
+#: app.php:308
 msgid "Personal"
 msgstr "KiÅŸisel"
 
-#: app.php:299
+#: app.php:313
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: app.php:304
+#: app.php:318
 msgid "Users"
 msgstr "KullanÄ±cÄ±lar"
 
-#: app.php:311
+#: app.php:325
 msgid "Apps"
 msgstr "Uygulamalar"
 
-#: app.php:313
+#: app.php:327
 msgid "Admin"
 msgstr "YÃ¶netici"
 
@@ -58,11 +59,15 @@ msgstr "Dosyalara dÃ¶n"
 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:229
+msgid "couldn't be determined"
+msgstr "tespit edilemedi"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "Uygulama etkinleÅŸtirilmedi"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Kimlik doÄŸrulama hatasÄ±"
 
@@ -82,55 +87,55 @@ msgstr "Metin"
 msgid "Images"
 msgstr "Resimler"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "saniye Ã¶nce"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 dakika Ã¶nce"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d dakika Ã¶nce"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 saat Ã¶nce"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d saat Ã¶nce"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "bugÃ¼n"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "dÃ¼n"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d gÃ¼n Ã¶nce"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "geÃ§en ay"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d ay Ã¶nce"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "geÃ§en yÄ±l"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "yÄ±l Ã¶nce"
 
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 0e563c6d4f5f9ef4e4a9fcf89d434b566bae2f3c..0fb46fd329c252b8c9a6843a8a53b7144ab3911d 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr "Etkin"
 msgid "Saving..."
 msgstr "Kaydediliyor..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__dil_adÄ±__"
 
@@ -103,15 +103,15 @@ msgstr "UygulamanÄ± Ekle"
 msgid "More Apps"
 msgstr "Daha fazla App"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Bir uygulama seÃ§in"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "UygulamanÄ±n sayfasÄ±na apps.owncloud.com adresinden bakÄ±n "
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -160,7 +160,7 @@ msgstr "Android Ä°stemcisini Ä°ndir"
 msgid "Download iOS Client"
 msgstr "iOS Ä°stemcisini Ä°ndir"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Parola"
 
@@ -230,11 +230,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ad"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Gruplar"
 
@@ -246,26 +246,30 @@ msgstr "OluÅŸtur"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "DiÄŸer"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "YÃ¶netici Grubu "
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Sil"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 66d4941f8deec64e2e8528c2225f6d51fd334b42..306152d4493c2e7665655ac9c92beb53db8c7102 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/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: 2012-12-29 00:07+0100\n"
-"PO-Revision-Date: 2012-12-28 09:39+0000\n"
-"Last-Translator: Necdet YÃ¼cel <necdetyucel@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr ""
 msgid "Base DN"
 msgstr "Base DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -115,10 +119,18 @@ msgstr "Port"
 msgid "Base User Tree"
 msgstr "Temel KullanÄ±cÄ± AÄŸacÄ±"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Temel Grup AÄŸacÄ±"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Grup-Ãœye iÅŸbirliÄŸi"
diff --git a/l10n/tr/user_webdavauth.po b/l10n/tr/user_webdavauth.po
index ca1186efbece1597109d02b2ec993aceb53ebd01..912a2ff24d2baefa7958a22c6042de8017769efe 100644
--- a/l10n/tr/user_webdavauth.po
+++ b/l10n/tr/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-28 00:20+0100\n"
-"PO-Revision-Date: 2012-12-27 09:06+0000\n"
-"Last-Translator: Necdet YÃ¼cel <necdetyucel@gmail.com>\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"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
 msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 213c999529778683f6e326e2c494b54fef756336..55b74a2fc0598c973855d87c897ff6cbde9aa722 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -7,12 +7,13 @@
 #   <skoptev@ukr.net>, 2012.
 # Soul Kim <warlock.rf@gmail.com>, 2012.
 #   <victor.dubiniuk@gmail.com>, 2012.
+#   <volodya327@gmail.com>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +22,24 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ %s Ð¿Ð¾Ð´Ñ–Ð»Ð¸Ð²ÑÑ Ñ„Ð°Ð¹Ð»Ð¾Ð¼ Ð· Ð²Ð°Ð¼Ð¸"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡ %s Ð¿Ð¾Ð´Ñ–Ð»Ð¸Ð²ÑÑ Ñ‚ÐµÐºÐ¾ÑŽ Ð· Ð²Ð°Ð¼Ð¸"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,59 +84,135 @@ msgstr "Ð–Ð¾Ð´Ð½Ð¾Ñ— ÐºÐ°Ñ‚ÐµÐ³Ð¾Ñ€Ñ–Ñ— Ð½Ðµ Ð¾Ð±Ñ€Ð°Ð½Ð¾ Ð´Ð»Ñ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½
 msgid "Error removing %s from favorites."
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ñ– %s Ñ–Ð· Ð¾Ð±Ñ€Ð°Ð½Ð¾Ð³Ð¾."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "ÐÐµÐ´Ñ–Ð»Ñ"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "ÐŸÐ¾Ð½ÐµÐ´Ñ–Ð»Ð¾Ðº"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Ð’Ñ–Ð²Ñ‚Ð¾Ñ€Ð¾Ðº"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Ð¡ÐµÑ€ÐµÐ´Ð°"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "ÐŸ'ÑÑ‚Ð½Ð¸Ñ†Ñ"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°"
+
+#: js/config.php:33
+msgid "January"
+msgstr "Ð¡Ñ–Ñ‡ÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "Ð›ÑŽÑ‚Ð¸Ð¹"
+
+#: js/config.php:33
+msgid "March"
+msgstr "Ð‘ÐµÑ€ÐµÐ·ÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "April"
+msgstr "ÐšÐ²Ñ–Ñ‚ÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "Ð¢Ñ€Ð°Ð²ÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "June"
+msgstr "Ð§ÐµÑ€Ð²ÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "July"
+msgstr "Ð›Ð¸Ð¿ÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "Ð¡ÐµÑ€Ð¿ÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "September"
+msgstr "Ð’ÐµÑ€ÐµÑÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "October"
+msgstr "Ð–Ð¾Ð²Ñ‚ÐµÐ½ÑŒ"
+
+#: js/config.php:33
+msgid "November"
+msgstr "Ð›Ð¸ÑÑ‚Ð¾Ð¿Ð°Ð´"
+
+#: js/config.php:33
+msgid "December"
+msgstr "Ð“Ñ€ÑƒÐ´ÐµÐ½ÑŒ"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "ÑÐµÐºÑƒÐ½Ð´Ð¸ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} Ñ…Ð²Ð¸Ð»Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 Ð³Ð¾Ð´Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} Ð³Ð¾Ð´Ð¸Ð½Ð¸ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ÑÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "Ð²Ñ‡Ð¾Ñ€Ð°"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} Ð´Ð½Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ð¼Ñ–ÑÑÑ†Ñ"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} Ð¼Ñ–ÑÑÑ†Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "Ð¼Ñ–ÑÑÑ†Ñ– Ñ‚Ð¾Ð¼Ñƒ"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ñ€Ð¾ÐºÑƒ"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "Ñ€Ð¾ÐºÐ¸ Ñ‚Ð¾Ð¼Ñƒ"
 
@@ -165,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ°"
 
@@ -178,123 +255,141 @@ msgstr "ÐÐµ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾ Ñ–Ð¼'Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¸."
 msgid "The required file {file} is not installed!"
 msgstr "ÐÐµÐ¾Ð±Ñ…Ñ–Ð´Ð½Ð¸Ð¹ Ñ„Ð°Ð¹Ð» {file} Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸ Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð·Ð¼Ñ–Ð½Ñ– Ð¿Ð¾Ð²Ð½Ð¾Ð²Ð°Ð¶ÐµÐ½ÑŒ"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr " {owner} Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² Ð´Ð»Ñ Ð’Ð°Ñ Ñ‚Ð° Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¸ {group}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "{owner} Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ð² Ð´Ð»Ñ Ð’Ð°Ñ"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ð´Ð»Ñ"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñ‡ÐµÑ€ÐµÐ· Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Ð—Ð°Ñ…Ð¸ÑÑ‚Ð¸Ñ‚Ð¸ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ð° Ð½Ð°Ð»ÐµÐ¶Ð¸Ñ‚ÑŒ ÐŸÐ°Ð½Ñƒ"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "ÐÐ°Ð´Ñ–ÑÐ»Ð°Ñ‚Ð¸"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ñ‚ÐµÑ€Ð¼Ñ–Ð½ Ð´Ñ–Ñ—"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "Ð¢ÐµÑ€Ð¼Ñ–Ð½ Ð´Ñ–Ñ—"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸ Ñ‡ÐµÑ€ÐµÐ· Ð•Ð». Ð¿Ð¾ÑˆÑ‚Ñƒ:"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "Ð–Ð¾Ð´Ð½Ð¾Ñ— Ð»ÑŽÐ´Ð¸Ð½Ð¸ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ÐŸÐµÑ€Ðµ-Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ°Ñ†Ñ–Ñ Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÑÑ”Ñ‚ÑŒÑÑ"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "ÐžÐ¿ÑƒÐ±Ð»Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾ {item} Ð´Ð»Ñ {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Ð—Ð°Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "Ð¼Ð¾Ð¶Ðµ Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ñ‚Ð¸"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒ Ð´Ð¾ÑÑ‚ÑƒÐ¿Ñƒ"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "ÑÑ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "Ð¾Ð½Ð¾Ð²Ð¸Ñ‚Ð¸"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "Ð¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÑƒÐ²Ð°Ñ‚Ð¸"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Ð—Ð°Ñ…Ð¸Ñ‰ÐµÐ½Ð¾ Ð¿Ð°Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ñ– Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ð° Ð´Ñ–Ñ—"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ– Ñ‚ÐµÑ€Ð¼Ñ–Ð½Ð° Ð´Ñ–Ñ—"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ..."
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ ownCloud"
@@ -446,87 +541,11 @@ msgstr "Ð¥Ð¾ÑÑ‚ Ð±Ð°Ð·Ð¸ Ð´Ð°Ð½Ð¸Ñ…"
 msgid "Finish setup"
 msgstr "Ð—Ð°Ð²ÐµÑ€ÑˆÐ¸Ñ‚Ð¸ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "ÐÐµÐ´Ñ–Ð»Ñ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "ÐŸÐ¾Ð½ÐµÐ´Ñ–Ð»Ð¾Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Ð’Ñ–Ð²Ñ‚Ð¾Ñ€Ð¾Ðº"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Ð¡ÐµÑ€ÐµÐ´Ð°"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Ð§ÐµÑ‚Ð²ÐµÑ€"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "ÐŸ'ÑÑ‚Ð½Ð¸Ñ†Ñ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Ð¡ÑƒÐ±Ð¾Ñ‚Ð°"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "Ð¡Ñ–Ñ‡ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "Ð›ÑŽÑ‚Ð¸Ð¹"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "Ð‘ÐµÑ€ÐµÐ·ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "ÐšÐ²Ñ–Ñ‚ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "Ð¢Ñ€Ð°Ð²ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "Ð§ÐµÑ€Ð²ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "Ð›Ð¸Ð¿ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "Ð¡ÐµÑ€Ð¿ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "Ð’ÐµÑ€ÐµÑÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "Ð–Ð¾Ð²Ñ‚ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "Ð›Ð¸ÑÑ‚Ð¾Ð¿Ð°Ð´"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "Ð“Ñ€ÑƒÐ´ÐµÐ½ÑŒ"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "Ð²ÐµÐ±-ÑÐµÑ€Ð²Ñ–Ñ Ð¿Ñ–Ð´ Ð²Ð°ÑˆÐ¸Ð¼ ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÐµÐ¼"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "Ð’Ð¸Ñ…Ñ–Ð´"
 
@@ -567,18 +586,4 @@ msgstr "Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ð¹"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "ÐŸÐ¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ Ð½ÐµÐ±ÐµÐ·Ð¿ÐµÐºÑƒ!"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ Ð²Ð²ÐµÐ´Ñ–Ñ‚ÑŒ ÑÐ²Ñ–Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ. <br/>Ð— Ð¿Ð¸Ñ‚Ð°Ð½ÑŒ Ð±ÐµÐ·Ð¿ÐµÐºÐ¸, Ð’Ð°Ð¼ Ñ–Ð½ÐºÐ¾Ð»Ð¸ Ð´Ð¾Ð²ÐµÐ´ÐµÑ‚ÑŒÑÑ Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð¾ Ð²Ð²Ð¾Ð´Ð¸Ñ‚Ð¸ ÑÐ²Ñ–Ð¹ Ð¿Ð°Ñ€Ð¾Ð»ÑŒ."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¸Ñ‚Ð¸"
+msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ ownCloud Ð´Ð¾ Ð²ÐµÑ€ÑÑ–Ñ— %s, Ñ†Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑ‚Ð¸ Ð´ÐµÑÐºÐ¸Ð¹ Ñ‡Ð°Ñ."
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 12e46e92ae82df02199f6017c95cf1d1360bfd83..ac7166cb820a7e3295b7bde1e57808717dd74afd 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -34,46 +34,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "ÐÐµ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾ Ð¶Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ. ÐÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ°"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "Ð¤Ð°Ð¹Ð» ÑƒÑÐ¿Ñ–ÑˆÐ½Ð¾ Ð²Ð¸Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾ Ð±ÐµÐ· Ð¿Ð¾Ð¼Ð¸Ð»Ð¾Ðº."
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ€ Ð·Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÐ²Ð¸Ñ‰ÑƒÑ” upload_max_filesize Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° Ð² php.ini: "
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ€ Ð²Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ Ð¿ÐµÑ€ÐµÐ²Ð¸Ñ‰ÑƒÑ” Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¸Ð²Ñƒ MAX_FILE_SIZE Ð²ÐºÐ°Ð·Ð°Ð½Ñƒ Ð² HTML Ñ„Ð¾Ñ€Ð¼Ñ–"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "Ð¤Ð°Ð¹Ð» Ð²Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾ Ð»Ð¸ÑˆÐµ Ñ‡Ð°ÑÑ‚ÐºÐ¾Ð²Ð¾"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "ÐÐµ Ð²Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð¾ Ð¶Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ñ„Ð°Ð¹Ð»Ñƒ"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "Ð’Ñ–Ð´ÑÑƒÑ‚Ð½Ñ–Ð¹ Ñ‚Ð¸Ð¼Ñ‡Ð°ÑÐ¾Ð²Ð¸Ð¹ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "ÐÐµÐ²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ°Ñ‚Ð¸ Ð½Ð° Ð´Ð¸ÑÐº"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -81,11 +81,11 @@ msgstr ""
 msgid "Files"
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "Ð—Ð°Ð±Ð¾Ñ€Ð¾Ð½Ð¸Ñ‚Ð¸ Ð´Ð¾ÑÑ‚ÑƒÐ¿"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 
@@ -93,137 +93,151 @@ msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 msgid "Rename"
 msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} Ð²Ð¶Ðµ Ñ–ÑÐ½ÑƒÑ”"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "Ð·Ð°Ð¼Ñ–Ð½Ð°"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "Ð·Ð°Ð¿Ñ€Ð¾Ð¿Ð¾Ð½ÑƒÐ¹Ñ‚Ðµ Ð½Ð°Ð·Ð²Ñƒ"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð°"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ð¾ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ð·Ð°Ð¼Ñ–Ð½ÐµÐ½Ð¾ {new_name} Ð½Ð° {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "Ð½ÐµÐ¾Ð¿ÑƒÐ±Ð»Ñ–ÐºÐ¾Ð²Ð°Ð½Ð¾ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾ {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "ÐÐµÐ²Ñ–Ñ€Ð½Ðµ Ñ–Ð¼'Ñ, '\\', '/', '<', '>', ':', '\"', '|', '?' Ñ‚Ð° '*' Ð½Ðµ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ñ–."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ZIP-Ñ„Ð°Ð¹Ð»Ñƒ, Ñ†Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð¹Ð½ÑÑ‚Ð¸ Ð¿ÐµÐ²Ð½Ð¸Ð¹ Ñ‡Ð°Ñ."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð²Ð°Ñˆ Ñ„Ð°Ð¹Ð» Ñ‚Ð¾Ð¼Ñƒ, Ñ‰Ð¾ Ð²Ñ–Ð½ Ñ‚ÐµÐºÐ° Ð°Ð±Ð¾ Ñ„Ð°Ð¹Ð» Ñ€Ð¾Ð·Ð¼Ñ–Ñ€Ð¾Ð¼ 0 Ð±Ð°Ð¹Ñ‚"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "Ð—Ð°ÐºÑ€Ð¸Ñ‚Ð¸"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ÐžÑ‡Ñ–ÐºÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 Ñ„Ð°Ð¹Ð» Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑ”Ñ‚ÑŒÑÑ"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÑƒÑ”Ñ‚ÑŒÑÑ"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾."
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Ð’Ð¸ÐºÐ¾Ð½ÑƒÑ”Ñ‚ÑŒÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ. Ð—Ð°ÐºÑ€Ð¸Ñ‚Ñ‚Ñ Ñ†Ñ–Ñ”Ñ— ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÐ¸ Ð¿Ñ€Ð¸Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð²Ñ–Ð´Ð¼Ñ–Ð½Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ."
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð¿ÑƒÑÑ‚Ð¸Ð¼."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð¿Ñ€Ð¾ÑÐºÐ°Ð½Ð¾Ð²Ð°Ð½Ð¾"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿Ñ€Ð¸ ÑÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ–"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "Ð†Ð¼'Ñ"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "Ð Ð¾Ð·Ð¼Ñ–Ñ€"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Ð—Ð¼Ñ–Ð½ÐµÐ½Ð¾"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 Ð¿Ð°Ð¿ÐºÐ°"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} Ð¿Ð°Ð¿Ð¾Ðº"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 Ñ„Ð°Ð¹Ð»"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} Ñ„Ð°Ð¹Ð»Ñ–Ð²"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Ð’Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Ð Ð¾Ð±Ð¾Ñ‚Ð° Ð· Ñ„Ð°Ð¹Ð»Ð°Ð¼Ð¸"
@@ -272,36 +286,32 @@ msgstr "ÐŸÐ°Ð¿ÐºÐ°"
 msgid "From link"
 msgstr "Ð— Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Ð’Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "ÐŸÐµÑ€ÐµÑ€Ð²Ð°Ñ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "Ð¢ÑƒÑ‚ Ð½Ñ–Ñ‡Ð¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ”. Ð’Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ñ‚Ðµ Ñ‰Ð¾-Ð½ÐµÐ±ÑƒÐ´ÑŒ!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Ð¤Ð°Ð¹Ð» Ð·Ð°Ð½Ð°Ð´Ñ‚Ð¾ Ð²ÐµÐ»Ð¸ÐºÐ¸Ð¹"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸,Ñ‰Ð¾ Ð²Ð¸ Ð½Ð°Ð¼Ð°Ð³Ð°Ñ”Ñ‚ÐµÑÑŒ Ð²Ñ–Ð´Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ Ð¿ÐµÑ€ÐµÐ²Ð¸Ñ‰ÑƒÑŽÑ‚ÑŒ Ð¼Ð°ÐºÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð¸Ð¹ Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸Ð¹ Ñ€Ð¾Ð·Ð¼Ñ–Ñ€ Ñ„Ð°Ð¹Ð»Ñ–Ð² Ð½Ð° Ñ†ÑŒÐ¾Ð¼Ñƒ ÑÐµÑ€Ð²ÐµÑ€Ñ–."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸ ÑÐºÐ°Ð½ÑƒÑŽÑ‚ÑŒÑÑ, Ð·Ð°Ñ‡ÐµÐºÐ°Ð¹Ñ‚Ðµ, Ð±ÑƒÐ´ÑŒ-Ð»Ð°ÑÐºÐ°."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "ÐŸÐ¾Ñ‚Ð¾Ñ‡Ð½Ðµ ÑÐºÐ°Ð½ÑƒÐ²Ð°Ð½Ð½Ñ"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index 9b00d3b7a30e224d5c4744861c74df0aca8eae75..884db2f7afaec8e5a3403d75848cb8f311a60cd2 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 12:05+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "Ð¨Ð¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "ÐÐµ ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ñ‚Ð¸ Ñ„Ð°Ð¹Ð»Ð¸ Ð½Ð°ÑÑ‚ÑƒÐ¿Ð½Ð¸Ñ… Ñ‚Ð¸Ð¿Ñ–Ð²"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "Ð–Ð¾Ð´ÐµÐ½"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸ ÑˆÐ¸Ñ„Ñ€ÑƒÐ²Ð°Ð½Ð½Ñ"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 91a6d8643b120e48bdb72bc4efe8f1eda7fa9bdd..1a8bb981db62637413e84932fe4a921437a97152 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/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: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 12:22+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Ð¢ÐµÑ€Ð¼Ñ–Ð½ Ð´Ñ–Ñ— Ð²ÑÑ–Ñ… Ð²ÐµÑ€ÑÑ–Ð¹"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Ð†ÑÑ‚Ð¾Ñ€Ñ–Ñ"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "Ð’ÐµÑ€ÑÑ–Ñ—"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Ð¦Ðµ Ð¿Ñ€Ð¸Ð·Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð·Ð½Ð¸Ñ‰ÐµÐ½Ð½Ñ Ð²ÑÑ–Ñ… Ñ–ÑÐ½ÑƒÑŽÑ‡Ð¸Ñ… Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð¸Ñ… Ð²ÐµÑ€ÑÑ–Ð¹ Ð’Ð°ÑˆÐ¸Ñ… Ñ„Ð°Ð¹Ð»Ñ–Ð²"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "Ð’ÐµÑ€ÑÑ–Ñ— Ñ„Ð°Ð¹Ð»Ñ–Ð²"
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index f2a86e71708095c93c7265fdc1ded0888e026de1..8d1708aa24eb38a8c99236a18d7b5eadfd6c6b4d 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -6,13 +6,14 @@
 #   <dzubchikd@gmail.com>, 2012.
 #   <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-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-26 15:40+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2013-01-18 00:03+0100\n"
+"PO-Revision-Date: 2013-01-17 13:24+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"
@@ -20,51 +21,55 @@ 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:285
+#: app.php:301
 msgid "Help"
 msgstr "Ð”Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð°"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "ÐžÑÐ¾Ð±Ð¸ÑÑ‚Ðµ"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¸"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "ÐÐ´Ð¼Ñ–Ð½"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÐµÐ½Ð¾."
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "Ð¤Ð°Ð¹Ð»Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð±ÑƒÑ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ– Ð¿Ð¾ÑÐ»Ñ–Ð´Ð¾Ð²Ð½Ð¾."
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "ÐŸÐ¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ÑÑ Ð´Ð¾ Ñ„Ð°Ð¹Ð»Ñ–Ð²"
 
-#: files.php:386
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—"
 
@@ -84,55 +89,55 @@ msgstr "Ð¢ÐµÐºÑÑ‚"
 msgid "Images"
 msgstr "Ð—Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "ÑÐµÐºÑƒÐ½Ð´Ð¸ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 Ñ…Ð²Ð¸Ð»Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d Ñ…Ð²Ð¸Ð»Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 Ð³Ð¾Ð´Ð¸Ð½Ñƒ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d Ð³Ð¾Ð´Ð¸Ð½ Ñ‚Ð¾Ð¼Ñƒ"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ÑÑŒÐ¾Ð³Ð¾Ð´Ð½Ñ–"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "Ð²Ñ‡Ð¾Ñ€Ð°"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d Ð´Ð½Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ð¼Ñ–ÑÑÑ†Ñ"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d Ð¼Ñ–ÑÑÑ†Ñ–Ð² Ñ‚Ð¾Ð¼Ñƒ"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "Ð¼Ð¸Ð½ÑƒÐ»Ð¾Ð³Ð¾ Ñ€Ð¾ÐºÑƒ"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "Ñ€Ð¾ÐºÐ¸ Ñ‚Ð¾Ð¼Ñƒ"
 
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 372163ef68ace424e034395ab3f2fb6401b67488..ff129914fee2c09efb6c2ebe145e378277188f54 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -5,13 +5,13 @@
 # Translators:
 #   <dzubchikd@gmail.com>, 2012.
 #   <skoptev@ukr.net>, 2012.
-#   <volodya327@gmail.com>, 2012.
+#   <volodya327@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -90,7 +90,7 @@ msgstr "Ð’ÐºÐ»ÑŽÑ‡Ð¸Ñ‚Ð¸"
 msgid "Saving..."
 msgstr "Ð—Ð±ÐµÑ€Ñ–Ð³Ð°ÑŽ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -102,15 +102,15 @@ msgstr "Ð”Ð¾Ð´Ð°Ñ‚Ð¸ ÑÐ²Ð¾ÑŽ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ñƒ"
 msgid "More Apps"
 msgstr "Ð‘Ñ–Ð»ÑŒÑˆÐµ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Ð’Ð¸Ð±Ñ€Ð°Ñ‚Ð¸ Ð´Ð¾Ð´Ð°Ñ‚Ð¾Ðº"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "ÐŸÐµÑ€ÐµÐ³Ð»ÑÐ½ÑŒÑ‚Ðµ ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼ Ð½Ð° apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 
@@ -159,7 +159,7 @@ msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ ÐºÐ»Ñ–Ñ”Ð½Ñ‚ Ð´Ð»Ñ Android"
 msgid "Download iOS Client"
 msgstr "Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ ÐºÐ»Ñ–Ñ”Ð½Ñ‚ Ð´Ð»Ñ iOS"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ"
 
@@ -229,11 +229,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "Ð†Ð¼'Ñ"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "Ð“Ñ€ÑƒÐ¿Ð¸"
 
@@ -243,28 +243,32 @@ msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "ÑÑ…Ð¾Ð²Ð¸Ñ‰Ðµ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "ÐÐµÐ¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð¾"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "Ð†Ð½ÑˆÐµ"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ÐÐ´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð³Ñ€ÑƒÐ¿Ð¸"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "Ð¡Ñ…Ð¾Ð²Ð¸Ñ‰Ðµ"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "Ð—Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index b6601497ecb5f84cecf414a7ee20b836d7bf8612..24f0b5ffdbb4863cf8a048ed543121aa66cef131 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.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-19 00:03+0100\n"
-"PO-Revision-Date: 2012-12-18 12:52+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,9 +28,9 @@ msgstr "<b>Ð£Ð²Ð°Ð³Ð°:</b> Ð—Ð°ÑÑ‚Ð¾ÑÑƒÐ½ÐºÐ¸ user_ldap Ñ‚Ð° user_webdavauth 
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
-msgstr "<b>Ð£Ð²Ð°Ð³Ð°:</ b> ÐŸÐ¾Ñ‚Ñ€Ñ–Ð±Ð½Ð¸Ð¹ Ð¼Ð¾Ð´ÑƒÐ»ÑŒ PHP LDAP Ð½Ðµ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, Ð±Ð°Ð·Ð¾Ð²Ð° Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð° Ð¿Ñ€Ð°Ñ†ÑŽÐ²Ð°Ñ‚Ð¸ Ð½Ðµ Ð±ÑƒÐ´Ðµ. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð·Ð²ÐµÑ€Ð½Ñ–Ñ‚ÑŒÑÑ Ð´Ð¾ ÑÐ¸ÑÑ‚ÐµÐ¼Ð½Ð¾Ð³Ð¾ Ð°Ð´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€Ð°, Ñ‰Ð¾Ð± Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð¸Ñ‚Ð¸ Ð¹Ð¾Ð³Ð¾."
+"<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 "Host"
@@ -45,6 +45,10 @@ msgstr "ÐœÐ¾Ð¶Ð½Ð° Ð½Ðµ Ð²ÐºÐ°Ð·ÑƒÐ²Ð°Ñ‚Ð¸ Ð¿Ñ€Ð¾Ñ‚Ð¾ÐºÐ¾Ð», ÑÐºÑ‰Ð¾ Ð²Ð°Ð¼ Ð½
 msgid "Base DN"
 msgstr "Ð‘Ð°Ð·Ð¾Ð²Ð¸Ð¹ DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ð’Ð¸ Ð¼Ð¾Ð¶ÐµÑ‚Ðµ Ð·Ð°Ð´Ð°Ñ‚Ð¸ Ð‘Ð°Ð·Ð¾Ð²Ð¸Ð¹ DN Ð´Ð»Ñ ÐºÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð² Ñ– Ð³Ñ€ÑƒÐ¿ Ð½Ð° Ð²ÐºÐ»Ð°Ð´Ð¸Ð½Ñ†Ñ– Ð”Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾"
@@ -116,10 +120,18 @@ msgstr "ÐŸÐ¾Ñ€Ñ‚"
 msgid "Base User Tree"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ðµ Ð”ÐµÑ€ÐµÐ²Ð¾ ÐšÐ¾Ñ€Ð¸ÑÑ‚ÑƒÐ²Ð°Ñ‡Ñ–Ð²"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "ÐžÑÐ½Ð¾Ð²Ð½Ðµ Ð”ÐµÑ€ÐµÐ²Ð¾ Ð“Ñ€ÑƒÐ¿"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "ÐÑÐ¾Ñ†Ñ–Ð°Ñ†Ñ–Ñ Ð“Ñ€ÑƒÐ¿Ð°-Ð§Ð»ÐµÐ½"
diff --git a/l10n/uk/user_webdavauth.po b/l10n/uk/user_webdavauth.po
index d81333a1909bf206969635ccab594b6c7250d4d3..eec04d63355481b9d304238c7e00deb8d2f80b36 100644
--- a/l10n/uk/user_webdavauth.po
+++ b/l10n/uk/user_webdavauth.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-23 00:09+0100\n"
-"PO-Revision-Date: 2012-12-22 01:58+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\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"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,17 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr ""
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URL: http://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr "ownCloud Ð²Ñ–Ð´Ð¿Ñ€Ð°Ð²Ð¸Ñ‚ÑŒ Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ– Ð½Ð° Ñ†ÐµÐ¹ URL Ñ‚Ð° Ð±ÑƒÐ´Ðµ Ñ–Ð½Ñ‚ÐµÑ€Ð¿Ñ€ÐµÑ‚ÑƒÐ²Ð°Ñ‚Ð¸ http 401 Ñ– http 403, ÑÐº Ð½ÐµÐ²Ñ–Ñ€Ð½Ñ– Ð¾Ð±Ð»Ñ–ÐºÐ¾Ð²Ñ– Ð´Ð°Ð½Ñ–, Ð° Ð²ÑÑ– Ñ–Ð½ÑˆÑ– ÐºÐ¾Ð´Ð¸, ÑÐº Ð²Ñ–Ñ€Ð½Ñ–."
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index b3b6244ffcae792e5204983671cb5819f6801f2e..7f3635025e670df8126ebd72d6bcdbe70fc35b80 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -7,13 +7,13 @@
 #   <mattheu.9x@gmail.com>, 2012.
 #   <mattheu_9x@yahoo.com>, 2012.
 # Son Nguyen <sonnghit@gmail.com>, 2012.
-# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012.
+# SÆ¡n Nguyá»…n <sonnghit@gmail.com>, 2012-2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -22,29 +22,29 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "%s chia sáº» táºp tin nÃ y cho báº¡n"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "%s chia sáº» thÆ° má»¥c nÃ y cho báº¡n"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "NgÆ°á»i dÃ¹ng %s chia sáº» táºp tin \"%s\" cho báº¡n .Báº¡n cÃ³ thá»ƒ táº£i táº¡i Ä‘Ã¢y : %s"
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "NgÆ°á»i dÃ¹ng %s chia sáº» thÆ° má»¥c \"%s\" cho báº¡n .Báº¡n cÃ³ thá»ƒ táº£i táº¡i Ä‘Ã¢y : %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -84,59 +84,135 @@ msgstr "KhÃ´ng cÃ³ thá»ƒ loáº¡i nÃ o Ä‘Æ°á»£c chá»n Ä‘á»ƒ xÃ³a."
 msgid "Error removing %s from favorites."
 msgstr "Lá»—i xÃ³a %s tá»« má»¥c yÃªu thÃch."
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "Chá»§ nháºt"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "Thá»© 2"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "Thá»© 3"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "Thá»© 4"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "Thá»© 5"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "Thá»© "
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "Thá»© 7"
+
+#: js/config.php:33
+msgid "January"
+msgstr "ThÃ¡ng 1"
+
+#: js/config.php:33
+msgid "February"
+msgstr "ThÃ¡ng 2"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ThÃ¡ng 3"
+
+#: js/config.php:33
+msgid "April"
+msgstr "ThÃ¡ng 4"
+
+#: js/config.php:33
+msgid "May"
+msgstr "ThÃ¡ng 5"
+
+#: js/config.php:33
+msgid "June"
+msgstr "ThÃ¡ng 6"
+
+#: js/config.php:33
+msgid "July"
+msgstr "ThÃ¡ng 7"
+
+#: js/config.php:33
+msgid "August"
+msgstr "ThÃ¡ng 8"
+
+#: js/config.php:33
+msgid "September"
+msgstr "ThÃ¡ng 9"
+
+#: js/config.php:33
+msgid "October"
+msgstr "ThÃ¡ng 10"
+
+#: js/config.php:33
+msgid "November"
+msgstr "ThÃ¡ng 11"
+
+#: js/config.php:33
+msgid "December"
+msgstr "ThÃ¡ng 12"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "CÃ i Ä‘áº·t"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "vÃ i giÃ¢y trÆ°á»›c"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 phÃºt trÆ°á»›c"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} phÃºt trÆ°á»›c"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 giá» trÆ°á»›c"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} giá» trÆ°á»›c"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "hÃ´m nay"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "hÃ´m qua"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} ngÃ y trÆ°á»›c"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "thÃ¡ng trÆ°á»›c"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} thÃ¡ng trÆ°á»›c"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "thÃ¡ng trÆ°á»›c"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "nÄƒm trÆ°á»›c"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "nÄƒm trÆ°á»›c"
 
@@ -166,8 +242,8 @@ msgid "The object type is not specified."
 msgstr "Loáº¡i Ä‘á»‘i tÆ°á»£ng khÃ´ng Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "Lá»—i"
 
@@ -179,123 +255,141 @@ msgstr "TÃªn á»©ng dá»¥ng khÃ´ng Ä‘Æ°á»£c chá»‰ Ä‘á»‹nh."
 msgid "The required file {file} is not installed!"
 msgstr "Táºp tin cáº§n thiáº¿t {file} khÃ´ng Ä‘Æ°á»£c cÃ i Ä‘áº·t!"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh chia sáº»"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh gá»¡ chia sáº»"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "Lá»—i trong quÃ¡ trÃ¬nh phÃ¢n quyá»n"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ vá»›i báº¡n vÃ  nhÃ³m {group} bá»Ÿi {owner}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ bá»Ÿi {owner}"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "Chia sáº» vá»›i"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "Chia sáº» vá»›i liÃªn káº¿t"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "Máºt kháº©u báº£o vá»‡"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "Máºt kháº©u"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
-msgstr ""
+msgstr "Gá»Ÿi"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "Äáº·t ngÃ y káº¿t thÃºc"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "NgÃ y káº¿t thÃºc"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "Chia sáº» thÃ´ng qua email"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "KhÃ´ng tÃ¬m tháº¥y ngÆ°á»i nÃ o"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "Chia sáº» láº¡i khÃ´ng Ä‘Æ°á»£c cho phÃ©p"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "ÄÃ£ Ä‘Æ°á»£c chia sáº½ trong {item} vá»›i {user}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "Gá»¡ bá» chia sáº»"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "cÃ³ thá»ƒ chá»‰nh sá»a"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "quáº£n lÃ½ truy cáºp"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "táº¡o"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "cáºp nháºt"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "xÃ³a"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "chia sáº»"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "Máºt kháº©u báº£o vá»‡"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "Lá»—i khÃ´ng thiáº¿t láºp ngÃ y káº¿t thÃºc"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "Lá»—i cáº¥u hÃ¬nh ngÃ y káº¿t thÃºc"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
-msgstr ""
+msgstr "Äang gá»Ÿi ..."
 
-#: js/share.js:592
+#: js/share.js:609
 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 "Cáºp nháºt khÃ´ng thÃ nh cÃ´ng . Vui lÃ²ng thÃ´ng bÃ¡o Ä‘áº¿n <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\"> Cá»™ng Ä‘á»“ng ownCloud </a>."
+
+#: js/update.js:18
+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
 msgid "ownCloud password reset"
 msgstr "KhÃ´i phá»¥c máºt kháº©u Owncloud "
@@ -447,87 +541,11 @@ msgstr "Database host"
 msgid "Finish setup"
 msgstr "CÃ i Ä‘áº·t hoÃ n táº¥t"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "Chá»§ nháºt"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "Thá»© 2"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "Thá»© 3"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "Thá»© 4"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "Thá»© 5"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "Thá»© "
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "Thá»© 7"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "ThÃ¡ng 1"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "ThÃ¡ng 2"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ThÃ¡ng 3"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "ThÃ¡ng 4"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "ThÃ¡ng 5"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "ThÃ¡ng 6"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "ThÃ¡ng 7"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "ThÃ¡ng 8"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "ThÃ¡ng 9"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "ThÃ¡ng 10"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "ThÃ¡ng 11"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "ThÃ¡ng 12"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "cÃ¡c dá»‹ch vá»¥ web dÆ°á»›i sá»± kiá»ƒm soÃ¡t cá»§a báº¡n"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "ÄÄƒng xuáº¥t"
 
@@ -569,17 +587,3 @@ msgstr "Káº¿ tiáº¿p"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "Cáº£nh bÃ¡o báº£o máºt !"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "Vui lÃ²ng xÃ¡c nháºn máºt kháº©u cá»§a báº¡n. <br/> VÃ¬ lÃ½ do báº£o máºt thá»‰nh thoáº£ng báº¡n cÃ³ thá»ƒ Ä‘Æ°á»£c yÃªu cáº§u nháºp láº¡i máºt kháº©u."
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "Kiá»ƒm tra"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 972bed796762d7dd686d570090660fcc56698ec2..4250cfece6e1456b1c9ead992f0db0663d624274 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -35,46 +35,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "KhÃ´ng cÃ³ táºp tin nÃ o Ä‘Æ°á»£c táº£i lÃªn. Lá»—i khÃ´ng xÃ¡c Ä‘á»‹nh"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "KhÃ´ng cÃ³ lá»—i, cÃ¡c táºp tin Ä‘Ã£ Ä‘Æ°á»£c táº£i lÃªn thÃ nh cÃ´ng"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "KÃch thÆ°á»›c nhá»¯ng táºp tin táº£i lÃªn vÆ°á»£t quÃ¡ MAX_FILE_SIZE Ä‘Ã£ Ä‘Æ°á»£c quy Ä‘á»‹nh"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 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:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "KhÃ´ng cÃ³ táºp tin nÃ o Ä‘Æ°á»£c táº£i lÃªn"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "KhÃ´ng tÃ¬m tháº¥y thÆ° má»¥c táº¡m"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "KhÃ´ng thá»ƒ ghi "
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -82,11 +82,11 @@ msgstr ""
 msgid "Files"
 msgstr "Táºp tin"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "KhÃ´ng chia sáº½"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "XÃ³a"
 
@@ -94,137 +94,151 @@ msgstr "XÃ³a"
 msgid "Rename"
 msgstr "Sá»a tÃªn"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} Ä‘Ã£ tá»“n táº¡i"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "thay tháº¿"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "tÃªn gá»£i Ã½"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "há»§y"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "Ä‘Ã£ thay tháº¿ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "lÃ¹i láº¡i"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "Ä‘Ã£ thay tháº¿ {new_name} báº±ng {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "há»§y chia sáº½ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "Ä‘Ã£ xÃ³a {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "TÃªn khÃ´ng há»£p lá»‡, '\\', '/', '<', '>', ':', '\"', '|', '?' vÃ  '*' thÃ¬ khÃ´ng Ä‘Æ°á»£c phÃ©p dÃ¹ng."
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "Táº¡o táºp tin ZIP, Ä‘iá»u nÃ y cÃ³ thá»ƒ lÃ m máº¥t má»™t chÃºt thá»i gian"
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 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:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "Táº£i lÃªn lá»—i"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "ÄÃ³ng"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Chá»"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 tá»‡p tin Ä‘ang Ä‘Æ°á»£c táº£i lÃªn"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: 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:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "Há»§y táº£i lÃªn"
 
-#: js/files.js:464
+#: js/files.js:493
 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:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL khÃ´ng Ä‘Æ°á»£c Ä‘á»ƒ trá»‘ng."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} táºp tin Ä‘Ã£ Ä‘Æ°á»£c quÃ©t"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "lá»—i trong khi quÃ©t"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "TÃªn"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "KÃch cá»¡"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "Thay Ä‘á»•i"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 thÆ° má»¥c"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} thÆ° má»¥c"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 táºp tin"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} táºp tin"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "Táº£i lÃªn"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "Xá» lÃ½ táºp tin"
@@ -273,36 +287,32 @@ msgstr "ThÆ° má»¥c"
 msgid "From link"
 msgstr "Tá»« liÃªn káº¿t"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "Táº£i lÃªn"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "Há»§y upload"
 
-#: templates/index.php:56
+#: templates/index.php:55
 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:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "Táº£i xuá»‘ng"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "Táºp tin táº£i lÃªn quÃ¡ lá»›n"
 
-#: templates/index.php:104
+#: templates/index.php:103
 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:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "Táºp tin Ä‘ang Ä‘Æ°á»£c quÃ©t ,vui lÃ²ng chá»."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "Hiá»‡n táº¡i Ä‘ang quÃ©t"
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index 0ac3a53087c5dcf55afeaf9eceeb5456b0cd5e15..a6019e03022d493e36b377a040cb7b306a8ea15d 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 05:48+0000\n"
-"Last-Translator: SÆ¡n Nguyá»…n <sonnghit@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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,18 +18,66 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "MÃ£ hÃ³a"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "Loáº¡i trá»« cÃ¡c loáº¡i táºp tin sau Ä‘Ã¢y tá»« mÃ£ hÃ³a"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "KhÃ´ng cÃ³ gÃ¬ háº¿t"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "Báº¬T mÃ£ hÃ³a"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index c06b31deb15a61c35ccb43808dd15a7b1d24d4f1..4de9dbf8467b1eac1bd1057ea19885f8d54d688f 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.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-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 04:32+0000\n"
-"Last-Translator: SÆ¡n Nguyá»…n <sonnghit@gmail.com>\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"
 "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"
@@ -19,22 +19,10 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "Háº¿t háº¡n táº¥t cáº£ cÃ¡c phiÃªn báº£n"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "Lá»‹ch sá»"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "PhiÃªn báº£n"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "Khi báº¡n thá»±c hiá»‡n thao tÃ¡c nÃ y sáº½ xÃ³a táº¥t cáº£ cÃ¡c phiÃªn báº£n sao lÆ°u hiá»‡n cÃ³ "
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "PhiÃªn báº£n táºp tin"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 915964d52ff2e3c390c62b6cfaf5bb6519d356c9..d838960fd97a3d113d073073b0c9558daedace5b 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.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-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 01:33+0000\n"
-"Last-Translator: mattheu_9x <mattheu.9x@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,51 +20,55 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "GiÃºp Ä‘á»¡"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "CÃ¡ nhÃ¢n"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "CÃ i Ä‘áº·t"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "NgÆ°á»i dÃ¹ng"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "á»¨ng dá»¥ng"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "Quáº£n trá»‹"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "Táº£i vá» ZIP Ä‘Ã£ bá»‹ táº¯t."
 
-#: files.php:362
+#: files.php:366
 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:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "Trá»Ÿ láº¡i táºp tin"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "Táºp tin Ä‘Æ°á»£c chá»n quÃ¡ lá»›n Ä‘á»ƒ táº¡o táºp tin ZIP."
 
+#: helper.php:228
+msgid "couldn't be determined"
+msgstr ""
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "á»¨ng dá»¥ng khÃ´ng Ä‘Æ°á»£c Báº¬T"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "Lá»—i xÃ¡c thá»±c"
 
@@ -84,55 +88,55 @@ msgstr "VÄƒn báº£n"
 msgid "Images"
 msgstr "HÃ¬nh áº£nh"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "1 giÃ¢y trÆ°á»›c"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 phÃºt trÆ°á»›c"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d phÃºt trÆ°á»›c"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1 giá» trÆ°á»›c"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%d giá» trÆ°á»›c"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "hÃ´m nay"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "hÃ´m qua"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d ngÃ y trÆ°á»›c"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "thÃ¡ng trÆ°á»›c"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d thÃ¡ng trÆ°á»›c"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "nÄƒm trÆ°á»›c"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "nÄƒm trÆ°á»›c"
 
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index d7c48f81a4bb9d4256519fa490a8043e2b5c1fea..3cb4e519b63e0f326ec9741dc1276558e1513edc 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr "Báºt"
 msgid "Saving..."
 msgstr "Äang tiáº¿n hÃ nh lÆ°u ..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__NgÃ´n ngá»¯___"
 
@@ -105,15 +105,15 @@ msgstr "ThÃªm á»©ng dá»¥ng cá»§a báº¡n"
 msgid "More Apps"
 msgstr "Nhiá»u á»©ng dá»¥ng hÆ¡n"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "Chá»n má»™t á»©ng dá»¥ng"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 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:32
+#: templates/apps.php:29
 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>"
 
@@ -162,7 +162,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "Máºt kháº©u"
 
@@ -232,11 +232,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "TÃªn"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "NhÃ³m"
 
@@ -248,26 +248,30 @@ msgstr "Táº¡o"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "KhÃ¡c"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "NhÃ³m quáº£n trá»‹"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "XÃ³a"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index c6157201e51ac3e2f015f8b2abecf3fb89c75c09..6e3346126072e1aeccc10b3da311852450491e32 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -28,8 +28,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -45,6 +45,10 @@ msgstr "Báº¡n cÃ³ thá»ƒ bá» qua cÃ¡c giao thá»©c, ngoáº¡i trá»« SSL. Sau Ä‘Ã³ b
 msgid "Base DN"
 msgstr "DN cÆ¡ báº£n"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 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"
@@ -116,10 +120,18 @@ msgstr "Cá»•ng"
 msgid "Base User Tree"
 msgstr "CÃ¢y ngÆ°á»i dÃ¹ng cÆ¡ báº£n"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "CÃ¢y nhÃ³m cÆ¡ báº£n"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "NhÃ³m thÃ nh viÃªn Cá»™ng Ä‘á»“ng"
diff --git a/l10n/vi/user_webdavauth.po b/l10n/vi/user_webdavauth.po
index 5faffd6c9af7df647872276edffc859a97530aaa..5442bdaff4254a6f120a189e07b7325d2a1753b5 100644
--- a/l10n/vi/user_webdavauth.po
+++ b/l10n/vi/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: vi\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 237822bce7136d35026fb1c87d6479bfc44a05ae..54ee264a5a34f60fc74c08f323e23eb0ec834f43 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -19,24 +19,24 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -81,59 +81,135 @@ msgstr "æ²¡æœ‰é€‰è€…è¦åˆ é™¤çš„åˆ†ç±»."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "æ˜ŸæœŸå¤©"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "æ˜ŸæœŸä¸€"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "æ˜ŸæœŸäºŒ"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "æ˜ŸæœŸä¸‰"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "æ˜ŸæœŸå››"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "æ˜ŸæœŸäº”"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "æ˜ŸæœŸå…"
+
+#: js/config.php:33
+msgid "January"
+msgstr "ä¸€æœˆ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "äºŒæœˆ"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ä¸‰æœˆ"
+
+#: js/config.php:33
+msgid "April"
+msgstr "å››æœˆ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "äº”æœˆ"
+
+#: js/config.php:33
+msgid "June"
+msgstr "å…æœˆ"
+
+#: js/config.php:33
+msgid "July"
+msgstr "ä¸ƒæœˆ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "å…«æœˆ"
+
+#: js/config.php:33
+msgid "September"
+msgstr "ä¹æœˆ"
+
+#: js/config.php:33
+msgid "October"
+msgstr "åæœˆ"
+
+#: js/config.php:33
+msgid "November"
+msgstr "åä¸€æœˆ"
+
+#: js/config.php:33
+msgid "December"
+msgstr "åäºŒæœˆ"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "è®¾ç½®"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 åˆ†é’Ÿå‰"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} åˆ†é’Ÿå‰"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} å¤©å‰"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "ä¸Šä¸ªæœˆ"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "å¹´å‰"
 
@@ -163,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "é”™è¯¯"
 
@@ -176,123 +252,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "åˆ†äº«å‡ºé”™"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆåˆ†äº«å‡ºé”™"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "å˜æ›´æƒé™å‡ºé”™"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ç”± {owner} ä¸Žæ‚¨å’Œ {group} ç¾¤ç»„åˆ†äº«"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "ç”± {owner} ä¸Žæ‚¨åˆ†äº«"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "åˆ†äº«"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "åˆ†äº«é“¾æŽ¥"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "å¯†ç "
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "è®¾ç½®å¤±æ•ˆæ—¥æœŸ"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "å¤±æ•ˆæ—¥æœŸ"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "é€šè¿‡ç”µåé‚®ä»¶åˆ†äº«ï¼š"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "æŸ¥æ— æ¤äºº"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è®¸é‡å¤åˆ†äº«"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "å·²ç»ä¸Ž {user} åœ¨ {item} ä¸åˆ†äº«"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "å–æ¶ˆåˆ†äº«"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "å¯ç¼–è¾‘"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "è®¿é—®æŽ§åˆ¶"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "åˆ›å»º"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "åˆ é™¤"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "å–æ¶ˆè®¾ç½®å¤±æ•ˆæ—¥æœŸå‡ºé”™"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "è®¾ç½®å¤±æ•ˆæ—¥æœŸå‡ºé”™"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "ç§æœ‰äº‘å¯†ç é‡ç½®"
@@ -444,87 +538,11 @@ msgstr "æ•°æ®åº“ä¸»æœº"
 msgid "Finish setup"
 msgstr "å®Œæˆå®‰è£…"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "æ˜ŸæœŸå¤©"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "æ˜ŸæœŸä¸€"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "æ˜ŸæœŸäºŒ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "æ˜ŸæœŸä¸‰"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "æ˜ŸæœŸå››"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "æ˜ŸæœŸäº”"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "æ˜ŸæœŸå…"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "ä¸€æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "äºŒæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ä¸‰æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "å››æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "äº”æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "å…æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "ä¸ƒæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "å…«æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "ä¹æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "åæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "åä¸€æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "åäºŒæœˆ"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "ä½ æŽ§åˆ¶ä¸‹çš„ç½‘ç»œæœåŠ¡"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "æ³¨é”€"
 
@@ -566,17 +584,3 @@ msgstr "å‰è¿›"
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "å®‰å…¨è¦å‘Šï¼"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "è¯·ç¡®è®¤æ‚¨çš„å¯†ç ã€‚<br/>å¤„äºŽå®‰å…¨åŽŸå› ä½ å¶å°”ä¹Ÿä¼šè¢«è¦æ±‚å†æ¬¡è¾“å…¥æ‚¨çš„å¯†ç ã€‚"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "ç¡®è®¤"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index b066b89ba00501bc8b95913d32de727093cd6afc..4ae0f2a922500c4f4b227e1eb7e537f0f1718de9 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -33,46 +33,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "æ²¡æœ‰ä¸Šä¼ æ–‡ä»¶ã€‚æœªçŸ¥é”™è¯¯"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "æ²¡æœ‰ä»»ä½•é”™è¯¯,æ–‡ä»¶ä¸Šä¼ æˆåŠŸäº†"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†HTMLè¡¨å•æŒ‡å®šçš„MAX_FILE_SIZE"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "æ–‡ä»¶åªæœ‰éƒ¨åˆ†è¢«ä¸Šä¼ "
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "æ²¡æœ‰ä¸Šä¼ å®Œæˆçš„æ–‡ä»¶"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ä¸¢å¤±äº†ä¸€ä¸ªä¸´æ—¶æ–‡ä»¶å¤¹"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "å†™ç£ç›˜å¤±è´¥"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -80,11 +80,11 @@ msgstr ""
 msgid "Files"
 msgstr "æ–‡ä»¶"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "åˆ é™¤"
 
@@ -92,137 +92,151 @@ msgstr "åˆ é™¤"
 msgid "Rename"
 msgstr "é‡å‘½å"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²å˜åœ¨"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "æ›¿æ¢"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "æŽ¨èåç§°"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "å·²æ›¿æ¢ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "æ’¤é”€"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "å·²ç”¨ {old_name} æ›¿æ¢ {new_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "æœªåˆ†äº«çš„ {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "å·²åˆ é™¤çš„ {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "æ£åœ¨ç”ŸæˆZIPæ–‡ä»¶,è¿™å¯èƒ½éœ€è¦ç‚¹æ—¶é—´"
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ä¸èƒ½ä¸Šä¼ ä½ æŒ‡å®šçš„æ–‡ä»¶,å¯èƒ½å› ä¸ºå®ƒæ˜¯ä¸ªæ–‡ä»¶å¤¹æˆ–è€…å¤§å°ä¸º0"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "ä¸Šä¼ é”™è¯¯"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "å…³é—"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "Pending"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 ä¸ªæ–‡ä»¶æ£åœ¨ä¸Šä¼ "
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} ä¸ªæ–‡ä»¶æ£åœ¨ä¸Šä¼ "
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ä¸Šä¼ å–æ¶ˆäº†"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "æ–‡ä»¶æ£åœ¨ä¸Šä¼ ã€‚å…³é—é¡µé¢ä¼šå–æ¶ˆä¸Šä¼ ã€‚"
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "ç½‘å€ä¸èƒ½ä¸ºç©ºã€‚"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} ä¸ªæ–‡ä»¶å·²æ‰«æ"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "æ‰«æå‡ºé”™"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "åå—"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ä¿®æ”¹æ—¥æœŸ"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 ä¸ªæ–‡ä»¶å¤¹"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} ä¸ªæ–‡ä»¶å¤¹"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 ä¸ªæ–‡ä»¶"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} ä¸ªæ–‡ä»¶"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ä¸Šä¼ "
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "æ–‡ä»¶å¤„ç†ä¸"
@@ -271,36 +285,32 @@ msgstr "æ–‡ä»¶å¤¹"
 msgid "From link"
 msgstr "æ¥è‡ªé“¾æŽ¥"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ä¸Šä¼ "
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šä¼ "
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "è¿™é‡Œæ²¡æœ‰ä¸œè¥¿.ä¸Šä¼ ç‚¹ä»€ä¹ˆ!"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ä¸‹è½½"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "ä¸Šä¼ çš„æ–‡ä»¶å¤ªå¤§äº†"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ä½ æ£åœ¨è¯•å›¾ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†æ¤æœåŠ¡å™¨æ”¯æŒçš„æœ€å¤§çš„æ–‡ä»¶å¤§å°."
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "æ£åœ¨æ‰«ææ–‡ä»¶,è¯·ç¨å€™."
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "æ£åœ¨æ‰«æ"
diff --git a/l10n/zh_CN.GB2312/files_encryption.po b/l10n/zh_CN.GB2312/files_encryption.po
index eb4ddd9c548666fca4724d45a2b9cbb86fcfb90d..f85989afca25bac1489ba9ea14774d2acbae2209 100644
--- a/l10n/zh_CN.GB2312/files_encryption.po
+++ b/l10n/zh_CN.GB2312/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-18 02:01+0200\n"
-"PO-Revision-Date: 2012-09-17 10:51+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "åŠ å¯†"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "ä»ŽåŠ å¯†ä¸æŽ’é™¤å¦‚ä¸‹æ–‡ä»¶ç±»åž‹"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "æ— "
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "å¯ç”¨åŠ å¯†"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 493edd7cfe636c908b14de85efff0ea8f93361da..7676ba278c2ef19f0de020e9e88ba807a7eb31a0 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/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: 2012-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 23:49+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "ä½œåºŸæ‰€æœ‰ç‰ˆæœ¬"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "åŽ†å²"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "ç‰ˆæœ¬"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "è¿™å°†åˆ é™¤æ‰€æœ‰æ‚¨çŽ°æœ‰æ–‡ä»¶çš„å¤‡ä»½ç‰ˆæœ¬"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "æ–‡ä»¶ç‰ˆæœ¬"
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index c32ef2de62caf50029587e8485f2302b95d00fd1..d03b24aa3aa136fca1b9156b048023e51233307e 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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -18,51 +18,55 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "å¸®åŠ©"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "ç§äºº"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "è®¾ç½®"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "ç”¨æˆ·"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "ç¨‹åº"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "ç®¡ç†å‘˜"
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP ä¸‹è½½å·²å…³é—"
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "éœ€è¦é€ä¸ªä¸‹è½½æ–‡ä»¶ã€‚"
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "è¿”å›žåˆ°æ–‡ä»¶"
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "éªŒè¯é”™è¯¯"
 
@@ -82,55 +86,55 @@ msgstr "æ–‡æœ¬"
 msgid "Images"
 msgstr "å›¾ç‰‡"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 åˆ†é’Ÿå‰"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d åˆ†é’Ÿå‰"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d å¤©å‰"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "ä¸Šä¸ªæœˆ"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "å¹´å‰"
 
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 78eea9c8908debcaaebaa346efe863029990a2af..deb922c37f44795d6d1d5b853e1966a42bedfd88 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "å¯ç”¨"
 msgid "Saving..."
 msgstr "ä¿å˜ä¸..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "Chinese"
 
@@ -101,15 +101,15 @@ msgstr "æ·»åŠ ä½ çš„åº”ç”¨ç¨‹åº"
 msgid "More Apps"
 msgstr "æ›´å¤šåº”ç”¨"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "é€‰æ‹©ä¸€ä¸ªç¨‹åº"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "åœ¨owncloud.comä¸ŠæŸ¥çœ‹åº”ç”¨ç¨‹åº"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>æŽˆæƒåè®® <span class=\"author\"></span>"
 
@@ -158,7 +158,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "å¯†ç "
 
@@ -228,11 +228,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "åå—"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "ç»„"
 
@@ -244,26 +244,30 @@ msgstr "æ–°å»º"
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "å…¶ä»–çš„"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ç¾¤ç»„ç®¡ç†å‘˜"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "åˆ é™¤"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 75ea9d9c0e9b2804f6fc360181a08eec92bd2b94..0e45bb6b182d373a0aa84403b1c8907dab354c02 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -27,8 +27,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +44,10 @@ msgstr "æ‚¨å¯ä»¥å¿½ç•¥åè®®ï¼Œé™¤éžæ‚¨éœ€è¦ SSLã€‚ç„¶åŽç”¨ ldaps:// å¼€å¤´"
 msgid "Base DN"
 msgstr "åŸºæœ¬åˆ¤åˆ«å"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "æ‚¨å¯ä»¥åœ¨é«˜çº§é€‰é¡¹å¡ä¸ä¸ºç”¨æˆ·å’Œç¾¤ç»„æŒ‡å®šåŸºæœ¬åˆ¤åˆ«å"
@@ -115,10 +119,18 @@ msgstr "ç«¯å£"
 msgid "Base User Tree"
 msgstr "åŸºæœ¬ç”¨æˆ·æ ‘"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "åŸºæœ¬ç¾¤ç»„æ ‘"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "ç¾¤ç»„-æˆå‘˜ç»„åˆ"
diff --git a/l10n/zh_CN.GB2312/user_webdavauth.po b/l10n/zh_CN.GB2312/user_webdavauth.po
index 4c2e6b80abea7f5a4b6ca483001545545e888209..e9984fbe007c063b9d72d5bb88d563326fe24caa 100644
--- a/l10n/zh_CN.GB2312/user_webdavauth.po
+++ b/l10n/zh_CN.GB2312/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: zh_CN.GB2312\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/zh_CN/core.po b/l10n/zh_CN/core.po
index 82cad2ce6b385632c70ce1b9f370c3da365cf0b3..f7c192f722db09ad2c307185802fa1b83b75a4a2 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -6,14 +6,15 @@
 #   <appweb.cn@gmail.com>, 2012.
 # Dianjin Wang <1132321739qq@gmail.com>, 2012.
 # Phoenix Nemo <>, 2012.
+#  <rainofchaos@gmail.com>, 2013.
 #   <suiy02@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -22,24 +23,24 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ç”¨æˆ· %s ä¸Žæ‚¨å…±äº«äº†ä¸€ä¸ªæ–‡ä»¶"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ç”¨æˆ· %s ä¸Žæ‚¨å…±äº«äº†ä¸€ä¸ªæ–‡ä»¶å¤¹"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -84,59 +85,135 @@ msgstr "æ²¡æœ‰é€‰æ‹©è¦åˆ é™¤çš„ç±»åˆ«"
 msgid "Error removing %s from favorites."
 msgstr "ä»Žæ”¶è—å¤¹ä¸ç§»é™¤%sæ—¶å‡ºé”™ã€‚"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "æ˜ŸæœŸæ—¥"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "æ˜ŸæœŸä¸€"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "æ˜ŸæœŸäºŒ"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "æ˜ŸæœŸä¸‰"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "æ˜ŸæœŸå››"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "æ˜ŸæœŸäº”"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "æ˜ŸæœŸå…"
+
+#: js/config.php:33
+msgid "January"
+msgstr "ä¸€æœˆ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "äºŒæœˆ"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ä¸‰æœˆ"
+
+#: js/config.php:33
+msgid "April"
+msgstr "å››æœˆ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "äº”æœˆ"
+
+#: js/config.php:33
+msgid "June"
+msgstr "å…æœˆ"
+
+#: js/config.php:33
+msgid "July"
+msgstr "ä¸ƒæœˆ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "å…«æœˆ"
+
+#: js/config.php:33
+msgid "September"
+msgstr "ä¹æœˆ"
+
+#: js/config.php:33
+msgid "October"
+msgstr "åæœˆ"
+
+#: js/config.php:33
+msgid "November"
+msgstr "åä¸€æœˆ"
+
+#: js/config.php:33
+msgid "December"
+msgstr "åäºŒæœˆ"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "è®¾ç½®"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "ç§’å‰"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "ä¸€åˆ†é’Ÿå‰"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} åˆ†é’Ÿå‰"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1å°æ—¶å‰"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} å°æ—¶å‰"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} å¤©å‰"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "ä¸Šæœˆ"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} æœˆå‰"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "æœˆå‰"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "å¹´å‰"
 
@@ -166,8 +243,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "é”™è¯¯"
 
@@ -179,123 +256,141 @@ msgstr "æœªæŒ‡å®šAppåç§°ã€‚"
 msgid "The required file {file} is not installed!"
 msgstr "æ‰€éœ€æ–‡ä»¶{file}æœªå®‰è£…ï¼"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "å…±äº«æ—¶å‡ºé”™"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆå…±äº«æ—¶å‡ºé”™"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "ä¿®æ”¹æƒé™æ—¶å‡ºé”™"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "{owner}å…±äº«ç»™æ‚¨åŠ{group}ç»„"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr " {owner}ä¸Žæ‚¨å…±äº«"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "å…±äº«"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "å…±äº«é“¾æŽ¥"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "å¯†ç ä¿æŠ¤"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "å¯†ç "
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
-msgstr ""
+msgstr "å‘é€é“¾æŽ¥åˆ°ä¸ªäºº"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "å‘é€"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "è®¾ç½®è¿‡æœŸæ—¥æœŸ"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "è¿‡æœŸæ—¥æœŸ"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "é€šè¿‡Emailå…±äº«"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "æœªæ‰¾åˆ°æ¤äºº"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è®¸äºŒæ¬¡å…±äº«"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "åœ¨{item} ä¸Ž {user}å…±äº«ã€‚"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "å¯ä»¥ä¿®æ”¹"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "è®¿é—®æŽ§åˆ¶"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "åˆ›å»º"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "åˆ é™¤"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "å…±äº«"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "å¯†ç å·²å—ä¿æŠ¤"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "å–æ¶ˆè®¾ç½®è¿‡æœŸæ—¥æœŸæ—¶å‡ºé”™"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "è®¾ç½®è¿‡æœŸæ—¥æœŸæ—¶å‡ºé”™"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "æ£åœ¨å‘é€..."
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr "é‡ç½® ownCloud å¯†ç "
@@ -447,87 +542,11 @@ msgstr "æ•°æ®åº“ä¸»æœº"
 msgid "Finish setup"
 msgstr "å®‰è£…å®Œæˆ"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "æ˜ŸæœŸæ—¥"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "æ˜ŸæœŸä¸€"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "æ˜ŸæœŸäºŒ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "æ˜ŸæœŸä¸‰"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "æ˜ŸæœŸå››"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "æ˜ŸæœŸäº”"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "æ˜ŸæœŸå…"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "ä¸€æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "äºŒæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ä¸‰æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "å››æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "äº”æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "å…æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "ä¸ƒæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "å…«æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "ä¹æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "åæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "åä¸€æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "åäºŒæœˆ"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "ç”±æ‚¨æŽŒæŽ§çš„ç½‘ç»œæœåŠ¡"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "æ³¨é”€"
 
@@ -568,18 +587,4 @@ msgstr "ä¸‹ä¸€é¡µ"
 #: templates/update.php:3
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
-msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "å®‰å…¨è¦å‘Šï¼"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "è¯·éªŒè¯æ‚¨çš„å¯†ç ã€‚ <br/>å‡ºäºŽå®‰å…¨è€ƒè™‘ï¼Œä½ å¯èƒ½å¶å°”ä¼šè¢«è¦æ±‚å†æ¬¡è¾“å…¥å¯†ç ã€‚"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "éªŒè¯"
+msgstr "æ›´æ–° ownCloud åˆ°ç‰ˆæœ¬ %sï¼Œè¿™å¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´ã€‚"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 9d7a6aacba4dc01d61d8e7f6f19ab2fa8526a30d..ac41681ce431145733fdcaec3df578f93913aa82 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -5,15 +5,17 @@
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
 # Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
 #   <rainofchaos@gmail.com>, 2012.
 #   <suiy02@gmail.com>, 2012.
+#  <wengxt@gmail.com>, 2013.
 #   <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -25,69 +27,69 @@ msgstr ""
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
-msgstr ""
+msgstr "æ— æ³•ç§»åŠ¨ %s - åŒåæ–‡ä»¶å·²å˜åœ¨"
 
 #: ajax/move.php:24
 #, php-format
 msgid "Could not move %s"
-msgstr ""
+msgstr "æ— æ³•ç§»åŠ¨ %s"
 
 #: ajax/rename.php:19
 msgid "Unable to rename file"
-msgstr ""
+msgstr "æ— æ³•é‡å‘½åæ–‡ä»¶"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "æ²¡æœ‰æ–‡ä»¶è¢«ä¸Šä¼ ã€‚æœªçŸ¥é”™è¯¯"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "æ²¡æœ‰å‘ç”Ÿé”™è¯¯ï¼Œæ–‡ä»¶ä¸Šä¼ æˆåŠŸã€‚"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ä¸Šä¼ æ–‡ä»¶å¤§å°å·²è¶…è¿‡php.iniä¸upload_max_filesizeæ‰€è§„å®šçš„å€¼"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†åœ¨HTML è¡¨å•ä¸æŒ‡å®šçš„MAX_FILE_SIZE"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "åªä¸Šä¼ äº†æ–‡ä»¶çš„ä¸€éƒ¨åˆ†"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "æ–‡ä»¶æ²¡æœ‰ä¸Šä¼ "
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "ç¼ºå°‘ä¸´æ—¶ç›®å½•"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "å†™å…¥ç£ç›˜å¤±è´¥"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
-msgstr ""
+msgstr "æ— æ•ˆæ–‡ä»¶å¤¹ã€‚"
 
 #: appinfo/app.php:10
 msgid "Files"
 msgstr "æ–‡ä»¶"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "å–æ¶ˆåˆ†äº«"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "åˆ é™¤"
 
@@ -95,137 +97,151 @@ msgstr "åˆ é™¤"
 msgid "Rename"
 msgstr "é‡å‘½å"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²å˜åœ¨"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "æ›¿æ¢"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "å»ºè®®åç§°"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "æ›¿æ¢ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "æ’¤é”€"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "å·²å°† {old_name}æ›¿æ¢æˆ {new_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "å–æ¶ˆäº†å…±äº« {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "åˆ é™¤äº† {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
-msgstr ""
+msgstr "'.' æ˜¯ä¸€ä¸ªæ— æ•ˆçš„æ–‡ä»¶åã€‚"
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
-msgstr ""
+msgstr "æ–‡ä»¶åä¸èƒ½ä¸ºç©ºã€‚"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "æ— æ•ˆåç§°ï¼Œ'\\', '/', '<', '>', ':', '\"', '|', '?' å’Œ '*' ä¸è¢«å…è®¸ä½¿ç”¨ã€‚"
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "æ£åœ¨ç”Ÿæˆ ZIP æ–‡ä»¶ï¼Œå¯èƒ½éœ€è¦ä¸€äº›æ—¶é—´"
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "ä¸‹è½½æ£åœ¨å‡†å¤‡ä¸ã€‚å¦‚æžœæ–‡ä»¶è¾ƒå¤§å¯èƒ½ä¼šèŠ±è´¹ä¸€äº›æ—¶é—´ã€‚"
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "æ— æ³•ä¸Šä¼ æ–‡ä»¶ï¼Œå› ä¸ºå®ƒæ˜¯ä¸€ä¸ªç›®å½•æˆ–è€…å¤§å°ä¸º 0 å—èŠ‚"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "ä¸Šä¼ é”™è¯¯"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "å…³é—"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "æ“ä½œç‰å¾…ä¸"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} ä¸ªæ–‡ä»¶ä¸Šä¼ ä¸"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ä¸Šä¼ å·²å–æ¶ˆ"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "æ–‡ä»¶æ£åœ¨ä¸Šä¼ ä¸ã€‚çŽ°åœ¨ç¦»å¼€æ¤é¡µä¼šå¯¼è‡´ä¸Šä¼ åŠ¨ä½œè¢«å–æ¶ˆã€‚"
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URLä¸èƒ½ä¸ºç©º"
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
-msgstr ""
+msgstr "æ— æ•ˆæ–‡ä»¶å¤¹åã€‚'å…±äº«' æ˜¯ Owncloud é¢„ç•™çš„æ–‡ä»¶å¤¹åã€‚"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} ä¸ªæ–‡ä»¶å·²æ‰«æã€‚"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "æ‰«ææ—¶å‡ºé”™"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "åç§°"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ä¿®æ”¹æ—¥æœŸ"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1ä¸ªæ–‡ä»¶å¤¹"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} ä¸ªæ–‡ä»¶å¤¹"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 ä¸ªæ–‡ä»¶"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} ä¸ªæ–‡ä»¶"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ä¸Šä¼ "
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "æ–‡ä»¶å¤„ç†"
@@ -274,36 +290,32 @@ msgstr "æ–‡ä»¶å¤¹"
 msgid "From link"
 msgstr "æ¥è‡ªé“¾æŽ¥"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ä¸Šä¼ "
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šä¼ "
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "è¿™é‡Œè¿˜ä»€ä¹ˆéƒ½æ²¡æœ‰ã€‚ä¸Šä¼ äº›ä¸œè¥¿å§ï¼"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ä¸‹è½½"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "ä¸Šä¼ æ–‡ä»¶è¿‡å¤§"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "æ‚¨æ£å°è¯•ä¸Šä¼ çš„æ–‡ä»¶è¶…è¿‡äº†æ¤æœåŠ¡å™¨å¯ä»¥ä¸Šä¼ çš„æœ€å¤§å®¹é‡é™åˆ¶"
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "æ–‡ä»¶æ£åœ¨è¢«æ‰«æï¼Œè¯·ç¨å€™ã€‚"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "å½“å‰æ‰«æ"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 502f4e08a6fd5c108f5a207328678d81f82e6f41..5395d6734d132a30a4abea4715d97f390682c6de 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-07 09:38+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+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"
@@ -18,18 +18,66 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr ""
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr ""
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "åŠ å¯†"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "ä»ŽåŠ å¯†ä¸æŽ’é™¤åˆ—å‡ºçš„æ–‡ä»¶ç±»åž‹"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "None"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "å¼€å¯åŠ å¯†"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index df61cf98da4b527852f8c1a85207f1522a0c3c95..8427a53caaf2a79ad03f6e2a25059abb631e6daf 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/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: 2012-09-28 23:34+0200\n"
-"PO-Revision-Date: 2012-09-28 09:58+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\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"
 "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"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "è¿‡æœŸæ‰€æœ‰ç‰ˆæœ¬"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "åŽ†å²"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "ç‰ˆæœ¬"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr "å°†ä¼šåˆ é™¤æ‚¨çš„æ–‡ä»¶çš„æ‰€æœ‰å¤‡ä»½ç‰ˆæœ¬"
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "æ–‡ä»¶ç‰ˆæœ¬"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index aebc5a42f35034da0757e2a76b6320609f0b4198..7dd9eb38371d73e138a1bdf39e8754142021837e 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.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-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-11-18 16:17+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,51 +19,55 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "å¸®åŠ©"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "ä¸ªäºº"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "è®¾ç½®"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "ç”¨æˆ·"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "åº”ç”¨"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "ç®¡ç†"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP ä¸‹è½½å·²ç»å…³é—"
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "éœ€è¦é€ä¸€ä¸‹è½½æ–‡ä»¶"
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "å›žåˆ°æ–‡ä»¶"
 
-#: files.php:386
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "è®¤è¯é”™è¯¯"
 
@@ -83,55 +87,55 @@ msgstr "æ–‡æœ¬"
 msgid "Images"
 msgstr "å›¾åƒ"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "å‡ ç§’å‰"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1åˆ†é’Ÿå‰"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d åˆ†é’Ÿå‰"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr "1å°æ—¶å‰"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr "%då°æ—¶å‰"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d å¤©å‰"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "ä¸Šæœˆ"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr "%d æœˆå‰"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "ä¸Šå¹´"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "å‡ å¹´å‰"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 8e151adfe079ce3d428f635eb641b6625a251bce..53b7fa6a2c743333bd6a2aa626deaa953e12ce85 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
-# Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# Dianjin Wang <1132321739qq@gmail.com>, 2012-2013.
 # Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 #   <suiy02@gmail.com>, 2012.
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -93,7 +93,7 @@ msgstr "å¯ç”¨"
 msgid "Saving..."
 msgstr "æ£åœ¨ä¿å˜"
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "ç®€ä½“ä¸æ–‡"
 
@@ -105,15 +105,15 @@ msgstr "æ·»åŠ åº”ç”¨"
 msgid "More Apps"
 msgstr "æ›´å¤šåº”ç”¨"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "é€‰æ‹©ä¸€ä¸ªåº”ç”¨"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "æŸ¥çœ‹åœ¨ app.owncloud.com çš„åº”ç”¨ç¨‹åºé¡µé¢"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-æ ¸å‡†ï¼š <span class=\"author\"></span>"
 
@@ -162,7 +162,7 @@ msgstr "ä¸‹è½½ Android å®¢æˆ·ç«¯"
 msgid "Download iOS Client"
 msgstr "ä¸‹è½½ iOS å®¢æˆ·ç«¯"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "å¯†ç "
 
@@ -232,11 +232,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "åç§°"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "ç»„"
 
@@ -246,28 +246,32 @@ msgstr "åˆ›å»º"
 
 #: templates/users.php:35
 msgid "Default Storage"
-msgstr ""
+msgstr "é»˜è®¤å˜å‚¨"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
-msgstr ""
+msgstr "æ— é™"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "å…¶å®ƒ"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ç»„ç®¡ç†å‘˜"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
-msgstr ""
+msgstr "å˜å‚¨"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
-msgstr ""
+msgstr "é»˜è®¤"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "åˆ é™¤"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index be2395852594a055441eacdb65efe250a92fe94c..b9c039f6bf88745c91d3d3855480be07a47d7789 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 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"
@@ -23,12 +24,12 @@ msgid ""
 "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
 " experience unexpected behaviour. Please ask your system administrator to "
 "disable one of them."
-msgstr ""
+msgstr "<b>è¦å‘Šï¼š</b>åº”ç”¨ user_ldap å’Œ user_webdavauth ä¸å…¼å®¹ã€‚æ‚¨å¯èƒ½éé‡æœªé¢„æ–™çš„è¡Œä¸ºã€‚è¯·åž‚è¯¢æ‚¨çš„ç³»ç»Ÿç®¡ç†å‘˜ç¦ç”¨å…¶ä¸ä¸€ä¸ªã€‚"
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -44,6 +45,10 @@ msgstr "å¯ä»¥å¿½ç•¥åè®®ï¼Œä½†å¦‚è¦ä½¿ç”¨SSLï¼Œåˆ™éœ€ä»¥ldaps://å¼€å¤´"
 msgid "Base DN"
 msgstr "Base DN"
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "æ‚¨å¯ä»¥åœ¨é«˜çº§é€‰é¡¹å¡é‡Œä¸ºç”¨æˆ·å’Œç»„æŒ‡å®šBase DN"
@@ -115,10 +120,18 @@ msgstr "ç«¯å£"
 msgid "Base User Tree"
 msgstr "åŸºç¡€ç”¨æˆ·æ ‘"
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "åŸºç¡€ç»„æ ‘"
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "ç»„æˆå‘˜å…³è”"
@@ -171,7 +184,7 @@ msgstr "å—èŠ‚æ•°"
 
 #: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "ä»¥ç§’è®¡ã€‚ä¿®æ”¹å°†æ¸…ç©ºç¼“å˜ã€‚"
 
 #: templates/settings.php:37
 msgid ""
diff --git a/l10n/zh_CN/user_webdavauth.po b/l10n/zh_CN/user_webdavauth.po
index fc3ccc1393be88c9d7775ca7066d0bfecbc4c1fa..a642c9b21d8e34fd1c856497463abaee7651d780 100644
--- a/l10n/zh_CN/user_webdavauth.po
+++ b/l10n/zh_CN/user_webdavauth.po
@@ -5,13 +5,15 @@
 # Translators:
 #   <appweb.cn@gmail.com>, 2012.
 # Dianjin Wang <1132321739qq@gmail.com>, 2012.
+# marguerite su <i@marguerite.su>, 2013.
+#  <wengxt@gmail.com>, 2013.
 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 13:55+0000\n"
-"Last-Translator: Dianjin Wang <1132321739qq@gmail.com>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-21 23:23+0000\n"
+"Last-Translator: Xuetian Weng <wengxt@gmail.com>\n"
 "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,13 +21,17 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: templates/settings.php:3
+msgid "WebDAV Authentication"
+msgstr "WebDAV è®¤è¯"
+
 #: templates/settings.php:4
 msgid "URL: http://"
 msgstr "URLï¼šhttp://"
 
 #: templates/settings.php:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
-msgstr ""
+"ownCloud will send the user credentials to this URL. This plugin checks the "
+"response and will interpret the HTTP statuscodes 401 and 403 as invalid "
+"credentials, and all other responses as valid credentials."
+msgstr "ownCloud å°†ä¼šå‘é€ç”¨æˆ·çš„èº«ä»½åˆ°æ¤ URLã€‚è¿™ä¸ªæ’ä»¶æ£€æŸ¥è¿”å›žå€¼å¹¶ä¸”å°† HTTP çŠ¶æ€ç¼–ç  401 å’Œ 403 è§£é‡Šä¸ºéžæ³•èº«ä»½ï¼Œå…¶ä»–æ‰€æœ‰è¿”å›žå€¼ä¸ºåˆæ³•èº«ä»½ã€‚"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index b1e7ea8b73d40cd54f058a01d5c3763e16dcb707..d6ed742922515489d75fc2c057a1e11ab458871f 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -18,24 +18,24 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr ""
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr ""
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
 msgstr ""
 
-#: ajax/share.php:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -80,59 +80,135 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Monday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Friday"
+msgstr ""
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr ""
+
+#: js/config.php:33
+msgid "January"
+msgstr ""
+
+#: js/config.php:33
+msgid "February"
+msgstr ""
+
+#: js/config.php:33
+msgid "March"
+msgstr ""
+
+#: js/config.php:33
+msgid "April"
+msgstr ""
+
+#: js/config.php:33
+msgid "May"
+msgstr ""
+
+#: js/config.php:33
+msgid "June"
+msgstr ""
+
+#: js/config.php:33
+msgid "July"
+msgstr ""
+
+#: js/config.php:33
+msgid "August"
+msgstr ""
+
+#: js/config.php:33
+msgid "September"
+msgstr ""
+
+#: js/config.php:33
+msgid "October"
+msgstr ""
+
+#: js/config.php:33
+msgid "November"
+msgstr ""
+
+#: js/config.php:33
+msgid "December"
+msgstr ""
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr ""
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr ""
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr ""
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr ""
 
@@ -162,8 +238,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr ""
 
@@ -175,123 +251,141 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr ""
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr ""
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr ""
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr ""
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr ""
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr ""
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr ""
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr ""
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr ""
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr ""
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr ""
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr ""
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr ""
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr ""
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr ""
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:592
+#: js/share.js:609
 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:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -443,87 +537,11 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr ""
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr ""
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr ""
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr ""
 
@@ -565,17 +583,3 @@ msgstr ""
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/zh_HK/files.po b/l10n/zh_HK/files.po
index 56eb4f59e2b43e4e506f0ace1ec5f4decb1013ae..d8fe0228bcbee2cac4a7612463ae8ecadaff2964 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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+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"
@@ -31,46 +31,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr ""
 
@@ -78,11 +78,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr ""
 
@@ -90,137 +90,151 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr ""
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr ""
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr ""
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr ""
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr ""
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr ""
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr ""
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr ""
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr ""
@@ -269,36 +283,32 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/zh_HK/files_encryption.po b/l10n/zh_HK/files_encryption.po
index 52a31f20bac4745fce9a995556c8604aa3557508..adf957c6ee48a1d333ab4d3fe2a4f1d2dbb3e13d 100644
--- a/l10n/zh_HK/files_encryption.po
+++ b/l10n/zh_HK/files_encryption.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-23 00:05+0100\n"
+"PO-Revision-Date: 2013-01-22 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,18 +17,66 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
-msgid "Encryption"
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
 msgstr ""
 
-#: templates/settings.php:4
-msgid "Exclude the following file types from encryption"
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
 msgstr ""
 
-#: templates/settings.php:5
-msgid "None"
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr ""
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr ""
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr ""
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr ""
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr ""
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
 msgstr ""
 
 #: templates/settings.php:10
-msgid "Enable Encryption"
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr ""
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr ""
+
+#: templates/settings.php:65
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:67
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:71
+msgid "None"
 msgstr ""
diff --git a/l10n/zh_HK/files_versions.po b/l10n/zh_HK/files_versions.po
index 392cfcc993528de998ddc216163a1fe587d32e48..4859a33c5a06418c44120019c078d02abbf0196b 100644
--- a/l10n/zh_HK/files_versions.po
+++ b/l10n/zh_HK/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/zh_HK/lib.po b/l10n/zh_HK/lib.po
index e4752fd9c271b660e07609b7f659fc9e9c04c138..f3bc0dc6e13e72d21cd779340b8873ab21fb9b44 100644
--- a/l10n/zh_HK/lib.po
+++ b/l10n/zh_HK/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: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,51 +17,55 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr ""
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr ""
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr ""
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr ""
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:386
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/zh_HK/settings.po b/l10n/zh_HK/settings.po
index db5e3f915b92e0a59297410545c4c175cddde7cf..bbba342f382f0edde4033c38f61c4cbed24f7757 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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -87,7 +87,7 @@ msgstr ""
 msgid "Saving..."
 msgstr ""
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr ""
 
@@ -99,15 +99,15 @@ msgstr ""
 msgid "More Apps"
 msgstr ""
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr ""
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr ""
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
@@ -156,7 +156,7 @@ msgstr ""
 msgid "Download iOS Client"
 msgstr ""
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr ""
 
@@ -226,11 +226,11 @@ msgid ""
 "License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/users.php:21 templates/users.php:81
-msgid "Name"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
 msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr ""
 
@@ -242,26 +242,30 @@ msgstr ""
 msgid "Default Storage"
 msgstr ""
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr ""
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr ""
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr ""
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr ""
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr ""
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr ""
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index 24846079f01b2f5da6a3470d33135c2d6256d0b3..8a7d8cdab9cdd1cd15e7105c1e0c95aa505af55a 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+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"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/zh_HK/user_webdavauth.po b/l10n/zh_HK/user_webdavauth.po
index c1f1ee6edb2583ebe3ecfbf06ac9572e4277a509..5a2c43c09ce8b3fa473f00fcfaa506d3dec9dd0c 100644
--- a/l10n/zh_HK/user_webdavauth.po
+++ b/l10n/zh_HK/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: zh_HK\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/zh_TW/core.po b/l10n/zh_TW/core.po
index 4f38d77222bc99fbe22bcf7a87846729a9bb6389..ee734ce272bbc797148bf3072ffc3b4952fa0969 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:23+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -21,24 +21,24 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ajax/share.php:84
+#: ajax/share.php:85
 #, php-format
 msgid "User %s shared a file with you"
 msgstr "ç”¨æˆ¶ %s èˆ‡æ‚¨åˆ†äº«äº†ä¸€å€‹æª”æ¡ˆ"
 
-#: ajax/share.php:86
+#: ajax/share.php:87
 #, php-format
 msgid "User %s shared a folder with you"
 msgstr "ç”¨æˆ¶ %s èˆ‡æ‚¨åˆ†äº«äº†ä¸€å€‹è³‡æ–™å¤¾"
 
-#: ajax/share.php:88
+#: ajax/share.php:89
 #, 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:90
+#: ajax/share.php:91
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
@@ -83,59 +83,135 @@ msgstr "æ²’æœ‰é¸æ“‡è¦åˆªé™¤çš„åˆ†é¡žã€‚"
 msgid "Error removing %s from favorites."
 msgstr "å¾žæœ€æ„›ç§»é™¤ %s æ™‚ç™¼ç”ŸéŒ¯èª¤ã€‚"
 
-#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/config.php:32
+msgid "Sunday"
+msgstr "é€±æ—¥"
+
+#: js/config.php:32
+msgid "Monday"
+msgstr "é€±ä¸€"
+
+#: js/config.php:32
+msgid "Tuesday"
+msgstr "é€±äºŒ"
+
+#: js/config.php:32
+msgid "Wednesday"
+msgstr "é€±ä¸‰"
+
+#: js/config.php:32
+msgid "Thursday"
+msgstr "é€±å››"
+
+#: js/config.php:32
+msgid "Friday"
+msgstr "é€±äº”"
+
+#: js/config.php:32
+msgid "Saturday"
+msgstr "é€±å…"
+
+#: js/config.php:33
+msgid "January"
+msgstr "ä¸€æœˆ"
+
+#: js/config.php:33
+msgid "February"
+msgstr "äºŒæœˆ"
+
+#: js/config.php:33
+msgid "March"
+msgstr "ä¸‰æœˆ"
+
+#: js/config.php:33
+msgid "April"
+msgstr "å››æœˆ"
+
+#: js/config.php:33
+msgid "May"
+msgstr "äº”æœˆ"
+
+#: js/config.php:33
+msgid "June"
+msgstr "å…æœˆ"
+
+#: js/config.php:33
+msgid "July"
+msgstr "ä¸ƒæœˆ"
+
+#: js/config.php:33
+msgid "August"
+msgstr "å…«æœˆ"
+
+#: js/config.php:33
+msgid "September"
+msgstr "ä¹æœˆ"
+
+#: js/config.php:33
+msgid "October"
+msgstr "åæœˆ"
+
+#: js/config.php:33
+msgid "November"
+msgstr "åä¸€æœˆ"
+
+#: js/config.php:33
+msgid "December"
+msgstr "åäºŒæœˆ"
+
+#: js/js.js:280 templates/layout.user.php:47 templates/layout.user.php:48
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: js/js.js:711
+#: js/js.js:762
 msgid "seconds ago"
 msgstr "å¹¾ç§’å‰"
 
-#: js/js.js:712
+#: js/js.js:763
 msgid "1 minute ago"
 msgstr "1 åˆ†é˜å‰"
 
-#: js/js.js:713
+#: js/js.js:764
 msgid "{minutes} minutes ago"
 msgstr "{minutes} åˆ†é˜å‰"
 
-#: js/js.js:714
+#: js/js.js:765
 msgid "1 hour ago"
 msgstr "1 å€‹å°æ™‚å‰"
 
-#: js/js.js:715
+#: js/js.js:766
 msgid "{hours} hours ago"
 msgstr "{hours} å°æ™‚å‰"
 
-#: js/js.js:716
+#: js/js.js:767
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: js/js.js:717
+#: js/js.js:768
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: js/js.js:718
+#: js/js.js:769
 msgid "{days} days ago"
 msgstr "{days} å¤©å‰"
 
-#: js/js.js:719
+#: js/js.js:770
 msgid "last month"
 msgstr "ä¸Šå€‹æœˆ"
 
-#: js/js.js:720
+#: js/js.js:771
 msgid "{months} months ago"
 msgstr "{months} å€‹æœˆå‰"
 
-#: js/js.js:721
+#: js/js.js:772
 msgid "months ago"
 msgstr "å¹¾å€‹æœˆå‰"
 
-#: js/js.js:722
+#: js/js.js:773
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: js/js.js:723
+#: js/js.js:774
 msgid "years ago"
 msgstr "å¹¾å¹´å‰"
 
@@ -165,8 +241,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:135 js/share.js:142 js/share.js:554
-#: js/share.js:566
+#: js/oc-vcategories.js:195 js/share.js:152 js/share.js:159 js/share.js:571
+#: js/share.js:583
 msgid "Error"
 msgstr "éŒ¯èª¤"
 
@@ -178,123 +254,141 @@ msgstr "æ²’æœ‰æŒ‡å®š app åç¨±ã€‚"
 msgid "The required file {file} is not installed!"
 msgstr "æ²’æœ‰å®‰è£æ‰€éœ€çš„æª”æ¡ˆ {file} ï¼"
 
-#: js/share.js:124 js/share.js:594
+#: 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
+msgid "Shared"
+msgstr ""
+
+#: js/share.js:141 js/share.js:611
 msgid "Error while sharing"
 msgstr "åˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:135
+#: js/share.js:152
 msgid "Error while unsharing"
 msgstr "å–æ¶ˆåˆ†äº«æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:142
+#: js/share.js:159
 msgid "Error while changing permissions"
 msgstr "ä¿®æ”¹æ¬Šé™æ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/share.js:151
+#: js/share.js:168
 msgid "Shared with you and the group {group} by {owner}"
 msgstr "ç”± {owner} åˆ†äº«çµ¦æ‚¨å’Œ {group}"
 
-#: js/share.js:153
+#: js/share.js:170
 msgid "Shared with you by {owner}"
 msgstr "{owner} å·²ç¶“å’Œæ‚¨åˆ†äº«"
 
-#: js/share.js:158
+#: js/share.js:175
 msgid "Share with"
 msgstr "èˆ‡...åˆ†äº«"
 
-#: js/share.js:163
+#: js/share.js:180
 msgid "Share with link"
 msgstr "ä½¿ç”¨é€£çµåˆ†äº«"
 
-#: js/share.js:166
+#: js/share.js:183
 msgid "Password protect"
 msgstr "å¯†ç¢¼ä¿è·"
 
-#: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
+#: js/share.js:185 templates/installation.php:44 templates/login.php:35
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
-#: js/share.js:172
+#: js/share.js:189
 msgid "Email link to person"
 msgstr "å°‡é€£çµ email çµ¦åˆ¥äºº"
 
-#: js/share.js:173
+#: js/share.js:190
 msgid "Send"
 msgstr "å¯„å‡º"
 
-#: js/share.js:177
+#: js/share.js:194
 msgid "Set expiration date"
 msgstr "è¨ç½®åˆ°æœŸæ—¥"
 
-#: js/share.js:178
+#: js/share.js:195
 msgid "Expiration date"
 msgstr "åˆ°æœŸæ—¥"
 
-#: js/share.js:210
+#: js/share.js:227
 msgid "Share via email:"
 msgstr "é€éŽ email åˆ†äº«ï¼š"
 
-#: js/share.js:212
+#: js/share.js:229
 msgid "No people found"
 msgstr "æ²’æœ‰æ‰¾åˆ°ä»»ä½•äºº"
 
-#: js/share.js:239
+#: js/share.js:256
 msgid "Resharing is not allowed"
 msgstr "ä¸å…è¨±é‡æ–°åˆ†äº«"
 
-#: js/share.js:275
+#: js/share.js:292
 msgid "Shared in {item} with {user}"
 msgstr "å·²å’Œ {user} åˆ†äº« {item}"
 
-#: js/share.js:296
+#: js/share.js:313
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: js/share.js:308
+#: js/share.js:325
 msgid "can edit"
 msgstr "å¯ç·¨è¼¯"
 
-#: js/share.js:310
+#: js/share.js:327
 msgid "access control"
 msgstr "å˜å–æŽ§åˆ¶"
 
-#: js/share.js:313
+#: js/share.js:330
 msgid "create"
 msgstr "å»ºç«‹"
 
-#: js/share.js:316
+#: js/share.js:333
 msgid "update"
 msgstr "æ›´æ–°"
 
-#: js/share.js:319
+#: js/share.js:336
 msgid "delete"
 msgstr "åˆªé™¤"
 
-#: js/share.js:322
+#: js/share.js:339
 msgid "share"
 msgstr "åˆ†äº«"
 
-#: js/share.js:356 js/share.js:541
+#: js/share.js:373 js/share.js:558
 msgid "Password protected"
 msgstr "å—å¯†ç¢¼ä¿è·"
 
-#: js/share.js:554
+#: js/share.js:571
 msgid "Error unsetting expiration date"
 msgstr "è§£é™¤éŽæœŸæ—¥è¨å®šå¤±æ•—"
 
-#: js/share.js:566
+#: js/share.js:583
 msgid "Error setting expiration date"
 msgstr "éŒ¯èª¤çš„åˆ°æœŸæ—¥è¨å®š"
 
-#: js/share.js:581
+#: js/share.js:598
 msgid "Sending ..."
 msgstr "æ£åœ¨å¯„å‡º..."
 
-#: js/share.js:592
+#: js/share.js:609
 msgid "Email sent"
 msgstr "Email å·²å¯„å‡º"
 
+#: 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:47
 msgid "ownCloud password reset"
 msgstr "ownCloud å¯†ç¢¼é‡è¨"
@@ -446,87 +540,11 @@ msgstr "è³‡æ–™åº«ä¸»æ©Ÿ"
 msgid "Finish setup"
 msgstr "å®Œæˆè¨å®š"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Sunday"
-msgstr "é€±æ—¥"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Monday"
-msgstr "é€±ä¸€"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Tuesday"
-msgstr "é€±äºŒ"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Wednesday"
-msgstr "é€±ä¸‰"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Thursday"
-msgstr "é€±å››"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Friday"
-msgstr "é€±äº”"
-
-#: templates/layout.guest.php:16 templates/layout.user.php:17
-msgid "Saturday"
-msgstr "é€±å…"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "January"
-msgstr "ä¸€æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "February"
-msgstr "äºŒæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "March"
-msgstr "ä¸‰æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "April"
-msgstr "å››æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "May"
-msgstr "äº”æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "June"
-msgstr "å…æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "July"
-msgstr "ä¸ƒæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "August"
-msgstr "å…«æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "September"
-msgstr "ä¹æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "October"
-msgstr "åæœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "November"
-msgstr "åä¸€æœˆ"
-
-#: templates/layout.guest.php:17 templates/layout.user.php:18
-msgid "December"
-msgstr "åäºŒæœˆ"
-
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:34
 msgid "web services under your control"
 msgstr "ç¶²è·¯æœå‹™åœ¨æ‚¨æŽ§åˆ¶ä¹‹ä¸‹"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:32
 msgid "Log out"
 msgstr "ç™»å‡º"
 
@@ -568,17 +586,3 @@ msgstr "ä¸‹ä¸€é "
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr "æ£åœ¨å°‡ Owncloud å‡ç´šè‡³ç‰ˆæœ¬ %s ï¼Œé€™å¯èƒ½éœ€è¦ä¸€é»žæ™‚é–“ã€‚"
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr "å®‰å…¨æ€§è¦å‘Šï¼"
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr "è«‹è¼¸å…¥æ‚¨çš„å¯†ç¢¼ã€‚<br/>åŸºæ–¼å®‰å…¨æ€§çš„ç†ç”±ï¼Œæ‚¨æœ‰æ™‚å€™å¯èƒ½æœƒè¢«è¦æ±‚å†æ¬¡è¼¸å…¥å¯†ç¢¼ã€‚"
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr "é©—è‰"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index bed97e748a0d7355b5bc86cd1b2ca4fb95be769c..a1e826aabd8afb312379eaa8bad04564f5e55bfe 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -7,14 +7,15 @@
 #   <dw4dev@gmail.com>, 2012.
 # Eddy Chang <taiwanmambo@gmail.com>, 2012.
 #   <nfsmwlin@gmail.com>, 2013.
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
 # ywang  <ywang1007@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-11 00:05+0100\n"
-"PO-Revision-Date: 2013-01-10 06:24+0000\n"
-"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 23:05+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,46 +37,46 @@ msgstr "ç„¡æ³•ç§»å‹• %s"
 msgid "Unable to rename file"
 msgstr "ç„¡æ³•é‡æ–°å‘½åæª”æ¡ˆ"
 
-#: ajax/upload.php:14
+#: ajax/upload.php:17
 msgid "No file was uploaded. Unknown error"
 msgstr "æ²’æœ‰æª”æ¡ˆè¢«ä¸Šå‚³ã€‚æœªçŸ¥çš„éŒ¯èª¤ã€‚"
 
-#: ajax/upload.php:21
+#: ajax/upload.php:24
 msgid "There is no error, the file uploaded with success"
 msgstr "ç„¡éŒ¯èª¤ï¼Œæª”æ¡ˆä¸Šå‚³æˆåŠŸ"
 
-#: ajax/upload.php:22
+#: ajax/upload.php:25
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr "ä¸Šå‚³çš„æª”æ¡ˆå¤§å°è¶…éŽ php.ini ç•¶ä¸ upload_max_filesize åƒæ•¸çš„è¨å®šï¼š"
 
-#: ajax/upload.php:24
+#: ajax/upload.php:27
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "ä¸Šå‚³çš„æª”æ¡ˆå¤§å°è¶…éŽ HTML è¡¨å–®ä¸ MAX_FILE_SIZE çš„é™åˆ¶"
 
-#: ajax/upload.php:26
+#: ajax/upload.php:29
 msgid "The uploaded file was only partially uploaded"
 msgstr "åªæœ‰æª”æ¡ˆçš„ä¸€éƒ¨åˆ†è¢«ä¸Šå‚³"
 
-#: ajax/upload.php:27
+#: ajax/upload.php:30
 msgid "No file was uploaded"
 msgstr "ç„¡å·²ä¸Šå‚³æª”æ¡ˆ"
 
-#: ajax/upload.php:28
+#: ajax/upload.php:31
 msgid "Missing a temporary folder"
 msgstr "éºå¤±æš«å˜è³‡æ–™å¤¾"
 
-#: ajax/upload.php:29
+#: ajax/upload.php:32
 msgid "Failed to write to disk"
 msgstr "å¯«å…¥ç¡¬ç¢Ÿå¤±æ•—"
 
-#: ajax/upload.php:45
-msgid "Not enough space available"
-msgstr "æ²’æœ‰è¶³å¤ çš„å¯ç”¨ç©ºé–“"
+#: ajax/upload.php:48
+msgid "Not enough storage available"
+msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:77
 msgid "Invalid directory."
 msgstr "ç„¡æ•ˆçš„è³‡æ–™å¤¾ã€‚"
 
@@ -83,11 +84,11 @@ msgstr "ç„¡æ•ˆçš„è³‡æ–™å¤¾ã€‚"
 msgid "Files"
 msgstr "æª”æ¡ˆ"
 
-#: js/fileactions.js:117 templates/index.php:82 templates/index.php:83
+#: js/fileactions.js:117 templates/index.php:81 templates/index.php:82
 msgid "Unshare"
 msgstr "å–æ¶ˆå…±äº«"
 
-#: js/fileactions.js:119 templates/index.php:88 templates/index.php:89
+#: js/fileactions.js:119 templates/index.php:87 templates/index.php:88
 msgid "Delete"
 msgstr "åˆªé™¤"
 
@@ -95,137 +96,151 @@ msgstr "åˆªé™¤"
 msgid "Rename"
 msgstr "é‡æ–°å‘½å"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "{new_name} already exists"
 msgstr "{new_name} å·²ç¶“å˜åœ¨"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "replace"
 msgstr "å–ä»£"
 
-#: js/filelist.js:205
+#: js/filelist.js:208
 msgid "suggest name"
 msgstr "å»ºè°æª”å"
 
-#: js/filelist.js:205 js/filelist.js:207
+#: js/filelist.js:208 js/filelist.js:210
 msgid "cancel"
 msgstr "å–æ¶ˆ"
 
-#: js/filelist.js:254
+#: js/filelist.js:253
 msgid "replaced {new_name}"
 msgstr "å·²å–ä»£ {new_name}"
 
-#: js/filelist.js:254 js/filelist.js:256 js/filelist.js:288 js/filelist.js:290
+#: js/filelist.js:253 js/filelist.js:255 js/filelist.js:286 js/filelist.js:288
 msgid "undo"
 msgstr "å¾©åŽŸ"
 
-#: js/filelist.js:256
+#: js/filelist.js:255
 msgid "replaced {new_name} with {old_name}"
 msgstr "ä½¿ç”¨ {new_name} å–ä»£ {old_name}"
 
-#: js/filelist.js:288
+#: js/filelist.js:286
 msgid "unshared {files}"
 msgstr "å·²å–æ¶ˆåˆ†äº« {files}"
 
-#: js/filelist.js:290
+#: js/filelist.js:288
 msgid "deleted {files}"
 msgstr "å·²åˆªé™¤ {files}"
 
-#: js/files.js:31
+#: js/files.js:52
 msgid "'.' is an invalid file name."
 msgstr "'.' æ˜¯ä¸åˆæ³•çš„æª”åã€‚"
 
-#: js/files.js:36
+#: js/files.js:56
 msgid "File name cannot be empty."
 msgstr "æª”åä¸èƒ½ç‚ºç©ºã€‚"
 
-#: js/files.js:45
+#: js/files.js:64
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr "æª”åä¸åˆæ³•ï¼Œä¸å…è¨± '\\', '/', '<', '>', ':', '\"', '|', '?' å’Œ '*' ã€‚"
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
-msgstr "ç”¢ç”Ÿ ZIP å£“ç¸®æª”ï¼Œé€™å¯èƒ½éœ€è¦ä¸€æ®µæ™‚é–“ã€‚"
+#: 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:224
+#: js/files.js:219
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
+msgstr "æ£åœ¨æº–å‚™æ‚¨çš„ä¸‹è¼‰ï¼Œè‹¥æ‚¨çš„æª”æ¡ˆè¼ƒå¤§ï¼Œå°‡æœƒéœ€è¦æ›´å¤šæ™‚é–“ã€‚"
+
+#: js/files.js:256
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ç„¡æ³•ä¸Šå‚³æ‚¨çš„æª”æ¡ˆå› ç‚ºå®ƒå¯èƒ½æ˜¯ä¸€å€‹ç›®éŒ„æˆ–æª”æ¡ˆå¤§å°ç‚º0"
 
-#: js/files.js:224
+#: js/files.js:256
 msgid "Upload Error"
 msgstr "ä¸Šå‚³ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/files.js:241
+#: js/files.js:273
 msgid "Close"
 msgstr "é—œé–‰"
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:292 js/files.js:408 js/files.js:439
 msgid "Pending"
 msgstr "ç‰å€™ä¸"
 
-#: js/files.js:280
+#: js/files.js:312
 msgid "1 file uploading"
 msgstr "1 å€‹æª”æ¡ˆæ£åœ¨ä¸Šå‚³"
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:315 js/files.js:370 js/files.js:385
 msgid "{count} files uploading"
 msgstr "{count} å€‹æª”æ¡ˆæ£åœ¨ä¸Šå‚³"
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:388 js/files.js:423
 msgid "Upload cancelled."
 msgstr "ä¸Šå‚³å–æ¶ˆ"
 
-#: js/files.js:464
+#: js/files.js:493
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "æª”æ¡ˆä¸Šå‚³ä¸ã€‚é›¢é–‹æ¤é é¢å°‡æœƒå–æ¶ˆä¸Šå‚³ã€‚"
 
-#: js/files.js:537
+#: js/files.js:566
 msgid "URL cannot be empty."
 msgstr "URL ä¸èƒ½ç‚ºç©ºç™½."
 
-#: js/files.js:543
+#: js/files.js:571
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr "ç„¡æ•ˆçš„è³‡æ–™å¤¾åç¨±ï¼Œ'Shared' çš„ä½¿ç”¨è¢« Owncloud ä¿ç•™"
 
-#: js/files.js:727
+#: js/files.js:784
 msgid "{count} files scanned"
 msgstr "{count} å€‹æª”æ¡ˆå·²æŽƒæ"
 
-#: js/files.js:735
+#: js/files.js:792
 msgid "error while scanning"
 msgstr "æŽƒææ™‚ç™¼ç”ŸéŒ¯èª¤"
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:866 templates/index.php:63
 msgid "Name"
 msgstr "åç¨±"
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:867 templates/index.php:74
 msgid "Size"
 msgstr "å¤§å°"
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:868 templates/index.php:76
 msgid "Modified"
 msgstr "ä¿®æ”¹"
 
-#: js/files.js:829
+#: js/files.js:887
 msgid "1 folder"
 msgstr "1 å€‹è³‡æ–™å¤¾"
 
-#: js/files.js:831
+#: js/files.js:889
 msgid "{count} folders"
 msgstr "{count} å€‹è³‡æ–™å¤¾"
 
-#: js/files.js:839
+#: js/files.js:897
 msgid "1 file"
 msgstr "1 å€‹æª”æ¡ˆ"
 
-#: js/files.js:841
+#: js/files.js:899
 msgid "{count} files"
 msgstr "{count} å€‹æª”æ¡ˆ"
 
+#: lib/helper.php:11 templates/index.php:18
+msgid "Upload"
+msgstr "ä¸Šå‚³"
+
 #: templates/admin.php:5
 msgid "File handling"
 msgstr "æª”æ¡ˆè™•ç†"
@@ -274,36 +289,32 @@ msgstr "è³‡æ–™å¤¾"
 msgid "From link"
 msgstr "å¾žé€£çµ"
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr "ä¸Šå‚³"
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr "å–æ¶ˆä¸Šå‚³"
 
-#: templates/index.php:56
+#: templates/index.php:55
 msgid "Nothing in here. Upload something!"
 msgstr "æ²’æœ‰ä»»ä½•æ±è¥¿ã€‚è«‹ä¸Šå‚³å…§å®¹ï¼"
 
-#: templates/index.php:70
+#: templates/index.php:69
 msgid "Download"
 msgstr "ä¸‹è¼‰"
 
-#: templates/index.php:102
+#: templates/index.php:101
 msgid "Upload too large"
 msgstr "ä¸Šå‚³éŽå¤§"
 
-#: templates/index.php:104
+#: templates/index.php:103
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "æ‚¨è©¦åœ–ä¸Šå‚³çš„æª”æ¡ˆå·²è¶…éŽä¼ºæœå™¨çš„æœ€å¤§æª”æ¡ˆå¤§å°é™åˆ¶ã€‚ã€€"
 
-#: templates/index.php:109
+#: templates/index.php:108
 msgid "Files are being scanned, please wait."
 msgstr "æ£åœ¨æŽƒææª”æ¡ˆï¼Œè«‹ç¨ç‰ã€‚"
 
-#: templates/index.php:112
+#: templates/index.php:111
 msgid "Current scanning"
 msgstr "ç›®å‰æŽƒæ"
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 1da95b438b9f96a8db38875a7dab099883540138..0ff077a2b2edc9a2bc42410866c7437a7521d49d 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -3,33 +3,82 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
 # ywang  <ywang1007@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 14:48+0000\n"
-"Last-Translator: ywang <ywang1007@gmail.com>\n"
+"POT-Creation-Date: 2013-01-27 00:04+0100\n"
+"PO-Revision-Date: 2013-01-26 01:44+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: templates/settings.php:3
+#: js/settings-personal.js:17
+msgid ""
+"Please switch to your ownCloud client and change your encryption password to"
+" complete the conversion."
+msgstr "è«‹è‡³æ‚¨çš„ ownCloud å®¢æˆ¶ç«¯ç¨‹å¼ä¿®æ”¹æ‚¨çš„åŠ å¯†å¯†ç¢¼ä»¥å®Œæˆè½‰æ›ã€‚"
+
+#: js/settings-personal.js:17
+msgid "switched to client side encryption"
+msgstr "å·²åˆ‡æ›ç‚ºå®¢æˆ¶ç«¯åŠ å¯†"
+
+#: js/settings-personal.js:21
+msgid "Change encryption password to login password"
+msgstr "å°‡åŠ å¯†å¯†ç¢¼ä¿®æ”¹ç‚ºç™»å…¥å¯†ç¢¼"
+
+#: js/settings-personal.js:25
+msgid "Please check your passwords and try again."
+msgstr "è«‹æª¢æŸ¥æ‚¨çš„å¯†ç¢¼ä¸¦å†è©¦ä¸€æ¬¡ã€‚"
+
+#: js/settings-personal.js:25
+msgid "Could not change your file encryption password to your login password"
+msgstr "ç„¡æ³•è®Šæ›´æ‚¨çš„æª”æ¡ˆåŠ å¯†å¯†ç¢¼ç‚ºç™»å…¥å¯†ç¢¼"
+
+#: templates/settings-personal.php:3 templates/settings.php:5
+msgid "Choose encryption mode:"
+msgstr "é¸æ“‡åŠ å¯†æ¨¡å¼ï¼š"
+
+#: templates/settings-personal.php:20 templates/settings.php:24
+msgid ""
+"Client side encryption (most secure but makes it impossible to access your "
+"data from the web interface)"
+msgstr "å®¢æˆ¶ç«¯åŠ å¯† (æœ€å®‰å…¨ä½†æ˜¯æœƒä½¿æ‚¨ç„¡æ³•å¾žç¶²é ç•Œé¢å˜å–æ‚¨çš„æª”æ¡ˆ)"
+
+#: templates/settings-personal.php:30 templates/settings.php:36
+msgid ""
+"Server side encryption (allows you to access your files from the web "
+"interface and the desktop client)"
+msgstr "ä¼ºæœå™¨ç«¯åŠ å¯† (æ‚¨å¯ä»¥å¾žç¶²é ç•Œé¢åŠå®¢æˆ¶ç«¯ç¨‹å¼å˜å–æ‚¨çš„æª”æ¡ˆ)"
+
+#: templates/settings-personal.php:41 templates/settings.php:60
+msgid "None (no encryption at all)"
+msgstr "ç„¡ (ä¸åŠ å¯†)"
+
+#: templates/settings.php:10
+msgid ""
+"Important: Once you selected an encryption mode there is no way to change it"
+" back"
+msgstr "é‡è¦ï¼šä¸€æ—¦æ‚¨é¸æ“‡äº†åŠ å¯†å°±ç„¡æ³•å†æ”¹å›žä¾†"
+
+#: templates/settings.php:48
+msgid "User specific (let the user decide)"
+msgstr "ä½¿ç”¨è€…è‡ªè¨‚ (è®“ä½¿ç”¨è€…è‡ªå·±æ±ºå®š)"
+
+#: templates/settings.php:65
 msgid "Encryption"
 msgstr "åŠ å¯†"
 
-#: templates/settings.php:4
+#: templates/settings.php:67
 msgid "Exclude the following file types from encryption"
 msgstr "ä¸‹åˆ—çš„æª”æ¡ˆé¡žåž‹ä¸åŠ å¯†"
 
-#: templates/settings.php:5
+#: templates/settings.php:71
 msgid "None"
 msgstr "ç„¡"
-
-#: templates/settings.php:10
-msgid "Enable Encryption"
-msgstr "å•Ÿç”¨åŠ å¯†"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 01ec04db5b4c09c7b9f7424c2b33663a88ec2c1f..c60cf46d161e377aea9bcadde4f3c316c28bb060 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 #   <dw4dev@gmail.com>, 2012.
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
 #   <wu0809@msn.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 14:28+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\n"
+"POT-Creation-Date: 2013-01-25 00:05+0100\n"
+"PO-Revision-Date: 2013-01-24 13:15+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,4 +48,4 @@ msgstr "ç„¡æ³•é è¦½"
 
 #: templates/public.php:43
 msgid "web services under your control"
-msgstr ""
+msgstr "åœ¨æ‚¨æŽŒæŽ§ä¹‹ä¸‹çš„ç¶²è·¯æœå‹™"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index de8f14754433e261c559ee5b6647f53c826590e8..1d41bf764bcdb2f6afb555cefee1a9829c44f11b 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/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: 2012-11-29 00:04+0100\n"
-"PO-Revision-Date: 2012-11-28 01:33+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,22 +18,10 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr "æ‰€æœ‰é€¾æœŸçš„ç‰ˆæœ¬"
-
 #: js/versions.js:16
 msgid "History"
 msgstr "æ·å²"
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr "ç‰ˆæœ¬"
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr "æª”æ¡ˆç‰ˆæœ¬åŒ–ä¸..."
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 2bc0c14b6c027aa6cde0a0c3ee3bf9685847cd79..8a76773c0768c4c8e859861b448b507e86af5390 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Pellaeon Lin <nfsmwlin@gmail.com>, 2013.
 #   <sofia168@livemail.tw>, 2012.
 #   <ywang1007+transifex@gmail.com>, 2012.
 # ywang  <ywang1007@gmail.com>, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-26 09:03+0000\n"
-"Last-Translator: sofiasu <sofia168@livemail.tw>\n"
+"POT-Creation-Date: 2013-01-24 00:06+0100\n"
+"PO-Revision-Date: 2013-01-23 10:07+0000\n"
+"Last-Translator: pellaeon <nfsmwlin@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,57 +21,61 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr "èªªæ˜Ž"
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr "å€‹äºº"
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr "è¨å®š"
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr "ä½¿ç”¨è€…"
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr "æ‡‰ç”¨ç¨‹å¼"
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr "ç®¡ç†"
 
-#: files.php:361
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr "ZIP ä¸‹è¼‰å·²é—œé–‰"
 
-#: files.php:362
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr "æª”æ¡ˆéœ€è¦é€ä¸€ä¸‹è¼‰"
 
-#: files.php:362 files.php:387
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr "å›žåˆ°æª”æ¡ˆåˆ—è¡¨"
 
-#: files.php:386
+#: files.php:390
 msgid "Selected files too large to generate zip file."
 msgstr "é¸æ“‡çš„æª”æ¡ˆå¤ªå¤§ä»¥è‡´æ–¼ç„¡æ³•ç”¢ç”Ÿå£“ç¸®æª”"
 
+#: helper.php:229
+msgid "couldn't be determined"
+msgstr "ç„¡æ³•åˆ¤æ–·"
+
 #: json.php:28
 msgid "Application is not enabled"
 msgstr "æ‡‰ç”¨ç¨‹å¼æœªå•Ÿç”¨"
 
-#: json.php:39 json.php:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr "èªè‰éŒ¯èª¤"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr "Token éŽæœŸ. è«‹é‡æ–°æ•´ç†é é¢"
+msgstr "Token éŽæœŸï¼Œè«‹é‡æ–°æ•´ç†é é¢ã€‚"
 
 #: search/provider/file.php:17 search/provider/file.php:35
 msgid "Files"
@@ -84,62 +89,62 @@ msgstr "æ–‡å—"
 msgid "Images"
 msgstr "åœ–ç‰‡"
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr "å¹¾ç§’å‰"
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr "1 åˆ†é˜å‰"
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d åˆ†é˜å‰"
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
-msgstr "1å°æ™‚ä¹‹å‰"
+msgstr "1 å°æ™‚ä¹‹å‰"
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
-msgstr "%då°æ™‚ä¹‹å‰"
+msgstr "%d å°æ™‚ä¹‹å‰"
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr "ä»Šå¤©"
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr "æ˜¨å¤©"
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr "%d å¤©å‰"
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr "ä¸Šå€‹æœˆ"
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
-msgstr "%då€‹æœˆä¹‹å‰"
+msgstr "%d å€‹æœˆä¹‹å‰"
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr "åŽ»å¹´"
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr "å¹¾å¹´å‰"
 
 #: updater.php:75
 #, 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
 msgid "up to date"
@@ -152,4 +157,4 @@ msgstr "æª¢æŸ¥æ›´æ–°å·²åœç”¨"
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
-msgstr "æ‰¾ä¸åˆ°åˆ†é¡ž-\"%s\""
+msgstr "æ‰¾ä¸åˆ°åˆ†é¡žï¼š\"%s\""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 36a92e308c28ab751171468ec14a44d4697801b9..e657008a0c02be9ef554ba375380f307bd3a1b8b 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-30 00:23+0100\n"
+"PO-Revision-Date: 2013-01-29 23:24+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -94,7 +94,7 @@ msgstr "å•Ÿç”¨"
 msgid "Saving..."
 msgstr "å„²å˜ä¸..."
 
-#: personal.php:42 personal.php:43
+#: personal.php:34 personal.php:35
 msgid "__language_name__"
 msgstr "__èªžè¨€_åç¨±__"
 
@@ -106,15 +106,15 @@ msgstr "æ·»åŠ ä½ çš„ App"
 msgid "More Apps"
 msgstr "æ›´å¤šApps"
 
-#: templates/apps.php:27
+#: templates/apps.php:24
 msgid "Select an App"
 msgstr "é¸æ“‡ä¸€å€‹æ‡‰ç”¨ç¨‹å¼"
 
-#: templates/apps.php:31
+#: templates/apps.php:28
 msgid "See application page at apps.owncloud.com"
 msgstr "æŸ¥çœ‹æ‡‰ç”¨ç¨‹å¼é é¢æ–¼ apps.owncloud.com"
 
-#: templates/apps.php:32
+#: templates/apps.php:29
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr "<span class=\"licence\"></span>-æ ¸å‡†: <span class=\"author\"></span>"
 
@@ -163,7 +163,7 @@ msgstr "ä¸‹è¼‰ Android å®¢æˆ¶ç«¯"
 msgid "Download iOS Client"
 msgstr "ä¸‹è¼‰ iOS å®¢æˆ¶ç«¯"
 
-#: templates/personal.php:21 templates/users.php:23 templates/users.php:82
+#: templates/personal.php:21 templates/users.php:23 templates/users.php:81
 msgid "Password"
 msgstr "å¯†ç¢¼"
 
@@ -233,11 +233,11 @@ 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/users.php:21 templates/users.php:81
-msgid "Name"
-msgstr "åç¨±"
+#: templates/users.php:21 templates/users.php:79
+msgid "Login Name"
+msgstr ""
 
-#: templates/users.php:26 templates/users.php:83 templates/users.php:103
+#: templates/users.php:26 templates/users.php:82 templates/users.php:107
 msgid "Groups"
 msgstr "ç¾¤çµ„"
 
@@ -249,26 +249,30 @@ msgstr "å‰µé€ "
 msgid "Default Storage"
 msgstr "é è¨å„²å˜å€"
 
-#: templates/users.php:42 templates/users.php:138
+#: templates/users.php:42 templates/users.php:142
 msgid "Unlimited"
 msgstr "ç„¡é™åˆ¶"
 
-#: templates/users.php:60 templates/users.php:153
+#: templates/users.php:60 templates/users.php:157
 msgid "Other"
 msgstr "å…¶ä»–"
 
-#: templates/users.php:85 templates/users.php:117
+#: templates/users.php:80
+msgid "Display Name"
+msgstr ""
+
+#: templates/users.php:84 templates/users.php:121
 msgid "Group Admin"
 msgstr "ç¾¤çµ„ ç®¡ç†å“¡"
 
-#: templates/users.php:87
+#: templates/users.php:86
 msgid "Storage"
 msgstr "å„²å˜å€"
 
-#: templates/users.php:133
+#: templates/users.php:137
 msgid "Default"
 msgstr "é è¨"
 
-#: templates/users.php:161
+#: templates/users.php:165
 msgid "Delete"
 msgstr "åˆªé™¤"
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index 2bf0669ac23496ff914c5b0c1ceef9e33417183e..e3b5d2655d9eeed8aeb2ae6110a5f965ab76a4d8 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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-21 00:04+0100\n"
+"PO-Revision-Date: 2013-01-19 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -27,13 +27,13 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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 "Host"
-msgstr ""
+msgstr "ä¸»æ©Ÿ"
 
 #: templates/settings.php:15
 msgid ""
@@ -44,6 +44,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -109,16 +113,24 @@ msgstr ""
 
 #: templates/settings.php:24
 msgid "Port"
-msgstr ""
+msgstr "é€£æŽ¥é˜œ"
 
 #: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/zh_TW/user_webdavauth.po b/l10n/zh_TW/user_webdavauth.po
index 0870470a5c2f6c3caf9191737f230394ec0434dc..d99e5ba2a7fcc2fb363b499fd94ef23f7f288eaf 100644
--- a/l10n/zh_TW/user_webdavauth.po
+++ b/l10n/zh_TW/user_webdavauth.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -18,13 +18,17 @@ msgstr ""
 "Language: zh_TW\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/zu_ZA/core.po b/l10n/zu_ZA/core.po
index eff86f297c436faa04f2046f3f394103b395142a..c559a642746664eb990f1ce410982d5758749058 100644
--- a/l10n/zu_ZA/core.po
+++ b/l10n/zu_ZA/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2013-01-12 00:09+0100\n"
-"PO-Revision-Date: 2013-01-11 23:09+0000\n"
+"POT-Creation-Date: 2013-01-15 00:03+0100\n"
+"PO-Revision-Date: 2013-01-14 23:03+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -207,7 +207,6 @@ msgid "Password protect"
 msgstr ""
 
 #: js/share.js:168 templates/installation.php:44 templates/login.php:35
-#: templates/verify.php:13
 msgid "Password"
 msgstr ""
 
@@ -564,17 +563,3 @@ msgstr ""
 #, php-format
 msgid "Updating ownCloud to version %s, this may take a while."
 msgstr ""
-
-#: templates/verify.php:5
-msgid "Security Warning!"
-msgstr ""
-
-#: templates/verify.php:6
-msgid ""
-"Please verify your password. <br/>For security reasons you may be "
-"occasionally asked to enter your password again."
-msgstr ""
-
-#: templates/verify.php:16
-msgid "Verify"
-msgstr ""
diff --git a/l10n/zu_ZA/files.po b/l10n/zu_ZA/files.po
index d9c0a65c13d81309e5a62ccc556befa93d702dc2..ceaf28a6991d5d3a6f84f2f8bd5af2acea7b98c5 100644
--- a/l10n/zu_ZA/files.po
+++ b/l10n/zu_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-01-10 00:04+0100\n"
-"PO-Revision-Date: 2013-01-09 23:04+0000\n"
+"POT-Creation-Date: 2013-01-20 00:05+0100\n"
+"PO-Revision-Date: 2013-01-19 23:05+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,11 @@ msgstr ""
 "Language: zu_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/delete.php:28 ajax/getstoragestats.php:11 ajax/upload.php:17
+#: ajax/upload.php:76 templates/index.php:18
+msgid "Upload"
+msgstr ""
+
 #: ajax/move.php:17
 #, php-format
 msgid "Could not move %s - File with this name already exists"
@@ -31,46 +36,46 @@ msgstr ""
 msgid "Unable to rename file"
 msgstr ""
 
-#: ajax/upload.php:14
+#: ajax/upload.php:20
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: ajax/upload.php:21
+#: ajax/upload.php:30
 msgid "There is no error, the file uploaded with success"
 msgstr ""
 
-#: ajax/upload.php:22
+#: ajax/upload.php:31
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
 msgstr ""
 
-#: ajax/upload.php:24
+#: ajax/upload.php:33
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr ""
 
-#: ajax/upload.php:26
+#: ajax/upload.php:35
 msgid "The uploaded file was only partially uploaded"
 msgstr ""
 
-#: ajax/upload.php:27
+#: ajax/upload.php:36
 msgid "No file was uploaded"
 msgstr ""
 
-#: ajax/upload.php:28
+#: ajax/upload.php:37
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ajax/upload.php:29
+#: ajax/upload.php:38
 msgid "Failed to write to disk"
 msgstr ""
 
-#: ajax/upload.php:45
+#: ajax/upload.php:57
 msgid "Not enough space available"
 msgstr ""
 
-#: ajax/upload.php:69
+#: ajax/upload.php:91
 msgid "Invalid directory."
 msgstr ""
 
@@ -126,98 +131,100 @@ msgstr ""
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:31
+#: js/files.js:48
 msgid "'.' is an invalid file name."
 msgstr ""
 
-#: js/files.js:36
+#: js/files.js:53
 msgid "File name cannot be empty."
 msgstr ""
 
-#: js/files.js:45
+#: js/files.js:62
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
 msgstr ""
 
-#: js/files.js:186
-msgid "generating ZIP-file, it may take some time."
+#: js/files.js:204
+msgid ""
+"Your download is being prepared. This might take some time if the files are "
+"big."
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:242
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:224
+#: js/files.js:242
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:241
+#: js/files.js:259
 msgid "Close"
 msgstr ""
 
-#: js/files.js:260 js/files.js:376 js/files.js:409
+#: js/files.js:278 js/files.js:397 js/files.js:431
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:280
+#: js/files.js:298
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:283 js/files.js:338 js/files.js:353
+#: js/files.js:301 js/files.js:357 js/files.js:372
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:357 js/files.js:393
+#: js/files.js:376 js/files.js:414
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:464
+#: js/files.js:486
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:537
+#: js/files.js:559
 msgid "URL cannot be empty."
 msgstr ""
 
-#: js/files.js:543
+#: js/files.js:565
 msgid "Invalid folder name. Usage of 'Shared' is reserved by Owncloud"
 msgstr ""
 
-#: js/files.js:727
+#: js/files.js:775
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:735
+#: js/files.js:783
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:808 templates/index.php:64
+#: js/files.js:857 templates/index.php:64
 msgid "Name"
 msgstr ""
 
-#: js/files.js:809 templates/index.php:75
+#: js/files.js:858 templates/index.php:75
 msgid "Size"
 msgstr ""
 
-#: js/files.js:810 templates/index.php:77
+#: js/files.js:859 templates/index.php:77
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:829
+#: js/files.js:878
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:831
+#: js/files.js:880
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:839
+#: js/files.js:888
 msgid "1 file"
 msgstr ""
 
-#: js/files.js:841
+#: js/files.js:890
 msgid "{count} files"
 msgstr ""
 
@@ -269,10 +276,6 @@ msgstr ""
 msgid "From link"
 msgstr ""
 
-#: templates/index.php:18
-msgid "Upload"
-msgstr ""
-
 #: templates/index.php:41
 msgid "Cancel upload"
 msgstr ""
diff --git a/l10n/zu_ZA/files_versions.po b/l10n/zu_ZA/files_versions.po
index 7bc842be41992a7c62d5c5d7c21833477d7069b5..190d72f8853461b0174132814fc4d4c75eb70a6e 100644
--- a/l10n/zu_ZA/files_versions.po
+++ b/l10n/zu_ZA/files_versions.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-06 00:00+0100\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,22 +17,10 @@ msgstr ""
 "Language: zu_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js/settings-personal.js:31 templates/settings-personal.php:10
-msgid "Expire all versions"
-msgstr ""
-
 #: js/versions.js:16
 msgid "History"
 msgstr ""
 
-#: templates/settings-personal.php:4
-msgid "Versions"
-msgstr ""
-
-#: templates/settings-personal.php:7
-msgid "This will delete all existing backup versions of your files"
-msgstr ""
-
 #: templates/settings.php:3
 msgid "Files Versioning"
 msgstr ""
diff --git a/l10n/zu_ZA/lib.po b/l10n/zu_ZA/lib.po
index 248d04871dac0b11db371ce0834a77548d1e94b9..f463152bf30beaaafd1e4de955032e4ba2f93b5b 100644
--- a/l10n/zu_ZA/lib.po
+++ b/l10n/zu_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: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2013-01-17 00:26+0100\n"
+"PO-Revision-Date: 2013-01-16 23:26+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,51 +17,55 @@ msgstr ""
 "Language: zu_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:285
+#: app.php:301
 msgid "Help"
 msgstr ""
 
-#: app.php:292
+#: app.php:308
 msgid "Personal"
 msgstr ""
 
-#: app.php:297
+#: app.php:313
 msgid "Settings"
 msgstr ""
 
-#: app.php:302
+#: app.php:318
 msgid "Users"
 msgstr ""
 
-#: app.php:309
+#: app.php:325
 msgid "Apps"
 msgstr ""
 
-#: app.php:311
+#: app.php:327
 msgid "Admin"
 msgstr ""
 
-#: files.php:332
+#: files.php:365
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:333
+#: files.php:366
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:333 files.php:358
+#: files.php:366 files.php:391
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:357
+#: files.php:390
 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:64 json.php:77 json.php:89
+#: json.php:39 json.php:62 json.php:73
 msgid "Authentication error"
 msgstr ""
 
@@ -81,55 +85,55 @@ msgstr ""
 msgid "Images"
 msgstr ""
 
-#: template.php:103
+#: template.php:113
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:104
+#: template.php:114
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:105
+#: template.php:115
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:106
+#: template.php:116
 msgid "1 hour ago"
 msgstr ""
 
-#: template.php:107
+#: template.php:117
 #, php-format
 msgid "%d hours ago"
 msgstr ""
 
-#: template.php:108
+#: template.php:118
 msgid "today"
 msgstr ""
 
-#: template.php:109
+#: template.php:119
 msgid "yesterday"
 msgstr ""
 
-#: template.php:110
+#: template.php:120
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:111
+#: template.php:121
 msgid "last month"
 msgstr ""
 
-#: template.php:112
+#: template.php:122
 #, php-format
 msgid "%d months ago"
 msgstr ""
 
-#: template.php:113
+#: template.php:123
 msgid "last year"
 msgstr ""
 
-#: template.php:114
+#: template.php:124
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/zu_ZA/user_ldap.po b/l10n/zu_ZA/user_ldap.po
index 3add8a2631ed46fd1648a81cd38e20a373895495..e02fa17c60cb1d03d8120bf6df63b959eaf60b98 100644
--- a/l10n/zu_ZA/user_ldap.po
+++ b/l10n/zu_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: 2012-12-15 00:11+0100\n"
-"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"POT-Creation-Date: 2013-01-16 00:19+0100\n"
+"PO-Revision-Date: 2013-01-15 23:20+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -26,8 +26,8 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid ""
-"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
-" not work. Please ask your system administrator to install it."
+"<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
@@ -43,6 +43,10 @@ msgstr ""
 msgid "Base DN"
 msgstr ""
 
+#: templates/settings.php:16
+msgid "One Base DN per line"
+msgstr ""
+
 #: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
@@ -114,10 +118,18 @@ msgstr ""
 msgid "Base User Tree"
 msgstr ""
 
+#: templates/settings.php:25
+msgid "One User Base DN per line"
+msgstr ""
+
 #: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
+#: templates/settings.php:26
+msgid "One Group Base DN per line"
+msgstr ""
+
 #: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
diff --git a/l10n/zu_ZA/user_webdavauth.po b/l10n/zu_ZA/user_webdavauth.po
index 3a53e0a85e8e145b08bf2eb06c8edd4eea72e6a6..012774040c7bbc2be13c4f73fbd9e8ff9664e7bc 100644
--- a/l10n/zu_ZA/user_webdavauth.po
+++ b/l10n/zu_ZA/user_webdavauth.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-20 00:11+0100\n"
-"PO-Revision-Date: 2012-12-19 23:12+0000\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"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,13 +17,17 @@ msgstr ""
 "Language: zu_ZA\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:6
 msgid ""
-"ownCloud will send the user credentials to this URL is interpret http 401 "
-"and http 403 as credentials wrong and all other codes as credentials "
-"correct."
+"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/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 9839dafbce16d88064b234d60c89742c463e6035..8f057cfb6e8820c28f75cbf2d5478648db2f5902 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -98,7 +98,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
         if ($this->connection) {
             $native_code = $this->connection->lastErrorCode();
         }
-	$native_msg = html_entity_decode($this->_lasterror);        
+	$native_msg = html_entity_decode($this->_lasterror);
 
         // PHP 5.2+ prepends the function name to $php_errormsg, so we need
         // this hack to work around it, per bug #9599.
diff --git a/lib/api.php b/lib/api.php
index cb67e0c2a892f33305e7e74b1146dc4dd50b1f8d..545b55757ff397795797912b1c8d741180d1d53c 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -42,12 +42,12 @@ class OC_API {
 	private static function init() {
 		self::$server = new OC_OAuth_Server(new OC_OAuth_Store());
 	}
-	
+
 	/**
 	 * api actions
 	 */
 	protected static $actions = array();
-	
+
 	/**
 	 * registers an api call
 	 * @param string $method the http method
@@ -58,7 +58,7 @@ class OC_API {
 	 * @param array $defaults
 	 * @param array $requirements
 	 */
-	public static function register($method, $url, $action, $app, 
+	public static function register($method, $url, $action, $app,
 				$authLevel = OC_API::USER_AUTH,
 				$defaults = array(),
 				$requirements = array()) {
@@ -73,7 +73,7 @@ class OC_API {
 		}
 		self::$actions[$name] = array('app' => $app, 'action' => $action, 'authlevel' => $authLevel);
 	}
-	
+
 	/**
 	 * handles an api call
 	 * @param array $parameters
@@ -90,10 +90,15 @@ class OC_API {
 		if(self::isAuthorised(self::$actions[$name])) {
 			if(is_callable(self::$actions[$name]['action'])) {
 				$response = call_user_func(self::$actions[$name]['action'], $parameters);
+				if(!($response instanceof OC_OCS_Result)) {
+					$response = new OC_OCS_Result(null, 996, 'Internal Server Error');
+				}
 			} else {
 				$response = new OC_OCS_Result(null, 998, 'Api method not found');
-			} 
+			}
 		} else {
+			header('WWW-Authenticate: Basic realm="Authorization Required"');
+			header('HTTP/1.0 401 Unauthorized');
 			$response = new OC_OCS_Result(null, 997, 'Unauthorised');
 		}
 		// Send the response
@@ -103,7 +108,7 @@ class OC_API {
 		// logout the user to be stateless
 		OC_User::logout();
 	}
-	
+
 	/**
 	 * authenticate the api call
 	 * @param array $action the action details as supplied to OC_API::register()
@@ -127,8 +132,7 @@ class OC_API {
 					return false;
 				} else {
 					$subAdmin = OC_SubAdmin::isSubAdmin($user);
-					$admin = OC_Group::inGroup($user, 'admin');
-					if($subAdmin || $admin) {
+					if($subAdmin) {
 						return true;
 					} else {
 						return false;
@@ -141,7 +145,7 @@ class OC_API {
 				if(!$user) {
 					return false;
 				} else {
-					return OC_Group::inGroup($user, 'admin');
+					return OC_User::isAdminUser($user);
 				}
 				break;
 			default:
@@ -149,18 +153,18 @@ class OC_API {
 				return false;
 				break;
 		}
-	} 
-	
+	}
+
 	/**
 	 * http basic auth
 	 * @return string|false (username, or false on failure)
 	 */
-	private static function loginUser(){ 
+	private static function loginUser(){
 		$authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : '';
 		$authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
 		return OC_User::login($authUser, $authPw) ? $authUser : false;
 	}
-	
+
 	/**
 	 * respond to a call
 	 * @param int|array $result the result from the api method
@@ -196,5 +200,5 @@ class OC_API {
 			}
 		}
 	}
-	
+
 }
diff --git a/lib/app.php b/lib/app.php
index fcf5a65458db4a685540e72138dfd7af40b96851..f851d802dc3c4f52b1519c122a052b8c738a4b88 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -63,17 +63,17 @@ class OC_App{
 
 		if (!defined('DEBUG') || !DEBUG) {
 			if (is_null($types)
-			    && empty(OC_Util::$core_scripts)
-			    && empty(OC_Util::$core_styles)) {
+				&& empty(OC_Util::$core_scripts)
+				&& empty(OC_Util::$core_styles)) {
 				OC_Util::$core_scripts = OC_Util::$scripts;
-				OC_Util::$scripts = array();
-				OC_Util::$core_styles = OC_Util::$styles;
-				OC_Util::$styles = array();
-			}
+			OC_Util::$scripts = array();
+			OC_Util::$core_styles = OC_Util::$styles;
+			OC_Util::$styles = array();
 		}
-		// return
-		return true;
 	}
+		// return
+	return true;
+}
 
 	/**
 	 * load a single app
@@ -137,7 +137,7 @@ class OC_App{
 
 		OC_Appconfig::setValue($app, 'types', $appTypes);
 	}
-	
+
 	/**
 	 * check if app is shipped
 	 * @param string $appid the id of the app to check
@@ -309,7 +309,7 @@ class OC_App{
 		if(OC_Config::getValue('knowledgebaseenabled', true)==true) {
 			$settings = array(
 				array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkToRoute( "settings_help" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" ))
-			);
+				);
 		}
 
 		// if the user is logged-in
@@ -323,14 +323,14 @@ class OC_App{
 				$settings[]=array( "id" => "settings", "order" => 1000, "href" => OC_Helper::linkToRoute( "settings_settings" ), "name" => $l->t("Settings"), "icon" => OC_Helper::imagePath( "settings", "settings.svg" ));
 
 			//SubAdmins are also allowed to access user management
-			if(OC_SubAdmin::isSubAdmin($_SESSION["user_id"]) || OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+			if(OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
 				// admin users menu
 				$settings[] = array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkToRoute( "settings_users" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" ));
 			}
 
 
 			// if the user is an admin
-			if(OC_Group::inGroup( $_SESSION["user_id"], "admin" )) {
+			if(OC_User::isAdminUser(OC_User::getUser())) {
 				// admin apps menu
 				$settings[] = array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkToRoute( "settings_apps" ).'?installed', "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" ));
 
@@ -529,16 +529,16 @@ class OC_App{
 		$forms=array();
 		switch($type) {
 			case 'settings':
-				$source=self::$settingsForms;
-				break;
+			$source=self::$settingsForms;
+			break;
 			case 'admin':
-				$source=self::$adminForms;
-				break;
+			$source=self::$adminForms;
+			break;
 			case 'personal':
-				$source=self::$personalForms;
-				break;
+			$source=self::$personalForms;
+			break;
 			default:
-				return array();
+			return array();
 		}
 		foreach($source as $form) {
 			$forms[]=include $form;
@@ -598,6 +598,76 @@ class OC_App{
 		return $apps;
 	}
 
+	/**
+	 * @brief: Lists all apps, this is used in apps.php
+	 * @return array
+	 */
+	public static function listAllApps() {
+		$installedApps = OC_App::getAllApps();
+
+		//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature?
+
+		$blacklist = array('files');//we dont want to show configuration for these
+		$appList = array();
+
+		foreach ( $installedApps as $app ) {
+			if ( array_search( $app, $blacklist ) === false ) {
+
+				$info=OC_App::getAppInfo($app);
+
+				if (!isset($info['name'])) {
+					OC_Log::write('core', 'App id "'.$app.'" has no name in appinfo', OC_Log::ERROR);
+					continue;
+				}
+
+				if ( OC_Appconfig::getValue( $app, 'enabled', 'no') == 'yes' ) {
+					$active = true;
+				} else {
+					$active = false;
+				}
+
+				$info['active'] = $active;
+
+				if(isset($info['shipped']) and ($info['shipped']=='true')) {
+					$info['internal']=true;
+					$info['internallabel']='Internal App';
+					$info['internalclass']='';
+					$info['update']=false;
+				} else {
+					$info['internal']=false;
+					$info['internallabel']='3rd Party App';
+					$info['internalclass']='externalapp';
+					$info['update']=OC_Installer::isUpdateAvailable($app);
+				}
+
+				$info['preview'] = OC_Helper::imagePath('settings', 'trans.png');
+				$info['version'] = OC_App::getAppVersion($app);
+				$appList[] = $info;
+			}
+		}
+		$remoteApps = OC_App::getAppstoreApps();
+		if ( $remoteApps ) {
+	// Remove duplicates
+			foreach ( $appList as $app ) {
+				foreach ( $remoteApps AS $key => $remote ) {
+					if (
+						$app['name'] == $remote['name']
+			// To set duplicate detection to use OCS ID instead of string name,
+			// enable this code, remove the line of code above,
+			// and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app:
+			// OR $app['ocs_id'] == $remote['ocs_id']
+						) {
+						unset( $remoteApps[$key]);
+				}
+			}
+		}
+		$combinedApps = array_merge( $appList, $remoteApps );
+	} else {
+		$combinedApps = $appList;
+	}	
+	return $combinedApps;	
+}
+
 	/**
 	 * @brief: get a list of all apps on apps.owncloud.com
 	 * @return array, multi-dimensional array of apps. Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description
@@ -767,7 +837,7 @@ class OC_App{
 				}
 				return new OC_FilesystemView('/'.OC_User::getUser().'/'.$appid);
 			}else{
-				OC_Log::write('core', 'Can\'t get app storage, app, user not logged in', OC_Log::ERROR);
+				OC_Log::write('core', 'Can\'t get app storage, app '.$appid.', user not logged in', OC_Log::ERROR);
 				return false;
 			}
 		}else{
diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php
index 28b5ce3af20580bff455c93baf7fe85d11527de0..9619dcb732cfebdb7cffb5631ff20641a19ffd7c 100644
--- a/lib/backgroundjob.php
+++ b/lib/backgroundjob.php
@@ -34,7 +34,7 @@ class OC_BackgroundJob{
 	public static function getExecutionType() {
 		return OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
 	}
-	
+
 	/**
 	 * @brief sets the background jobs execution type
 	 * @param $type execution type
diff --git a/lib/base.php b/lib/base.php
index 3d3e7d59f909f9affcf93bf868d6215c1ade18e1..f9818d3514e730ab52cc723fc6d9f9657927f97b 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -29,169 +29,176 @@ require_once 'public/constants.php';
  */
 class OC
 {
-    /**
-     * Assoziative array for autoloading. classname => filename
-     */
-    public static $CLASSPATH = array();
-    /**
-     * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
-     */
-    public static $SERVERROOT = '';
-    /**
-     * the current request path relative to the owncloud root (e.g. files/index.php)
-     */
-    private static $SUBURI = '';
-    /**
-     * the owncloud root path for http requests (e.g. owncloud/)
-     */
-    public static $WEBROOT = '';
-    /**
-     * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
-     */
-    public static $THIRDPARTYROOT = '';
-    /**
-     * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
-     */
-    public static $THIRDPARTYWEBROOT = '';
-    /**
-     * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and
-     * web path in 'url'
-     */
-    public static $APPSROOTS = array();
-    /*
-     * requested app
-     */
-    public static $REQUESTEDAPP = '';
-    /*
-     * requested file of app
-     */
-    public static $REQUESTEDFILE = '';
-    /**
-     * check if owncloud runs in cli mode
-     */
-    public static $CLI = false;
-    /*
-     * OC router
-     */
-    protected static $router = null;
-
-    /**
-     * SPL autoload
-     */
-    public static function autoload($className)
-    {
-        if (array_key_exists($className, OC::$CLASSPATH)) {
-            $path = OC::$CLASSPATH[$className];
-            /** @TODO: Remove this when necessary
-            Remove "apps/" from inclusion path for smooth migration to mutli app dir
-             */
-            if (strpos($path, 'apps/') === 0) {
-                OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG);
-                $path = str_replace('apps/', '', $path);
-            }
-        } elseif (strpos($className, 'OC_') === 0) {
-            $path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
-        } elseif (strpos($className, 'OC\\') === 0) {
-            $path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-        } elseif (strpos($className, 'OCP\\') === 0) {
-            $path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-        } elseif (strpos($className, 'OCA\\') === 0) {
-            $path = 'apps/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
-        } elseif (strpos($className, 'Sabre_') === 0) {
-            $path = str_replace('_', '/', $className) . '.php';
-        } elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
-            $path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
-        } elseif (strpos($className, 'Sabre\\VObject') === 0) {
-            $path = str_replace('\\', '/', $className) . '.php';
-        } elseif (strpos($className, 'Test_') === 0) {
-            $path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
-        } else {
-            return false;
-        }
-
-        if ($fullPath = stream_resolve_include_path($path)) {
-            require_once $fullPath;
-        }
-        return false;
-    }
-
-    public static function initPaths()
-    {
-        // calculate the root directories
-        OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
-        OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
-        $scriptName = $_SERVER["SCRIPT_NAME"];
-        if (substr($scriptName, -1) == '/') {
-            $scriptName .= 'index.php';
-            //make sure suburi follows the same rules as scriptName
-            if (substr(OC::$SUBURI, -9) != 'index.php') {
-                if (substr(OC::$SUBURI, -1) != '/') {
-                    OC::$SUBURI = OC::$SUBURI . '/';
-                }
-                OC::$SUBURI = OC::$SUBURI . 'index.php';
-            }
-        }
-
-        OC::$WEBROOT = substr($scriptName, 0, strlen($scriptName) - strlen(OC::$SUBURI));
-
-        if (OC::$WEBROOT != '' and OC::$WEBROOT[0] !== '/') {
-            OC::$WEBROOT = '/' . OC::$WEBROOT;
-        }
-
-        // ensure we can find OC_Config
-        set_include_path(
-            OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
-                get_include_path()
-        );
-
-        // search the 3rdparty folder
-        if (OC_Config::getValue('3rdpartyroot', '') <> '' and OC_Config::getValue('3rdpartyurl', '') <> '') {
-            OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', '');
-            OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', '');
-        } elseif (file_exists(OC::$SERVERROOT . '/3rdparty')) {
-            OC::$THIRDPARTYROOT = OC::$SERVERROOT;
-            OC::$THIRDPARTYWEBROOT = OC::$WEBROOT;
-        } elseif (file_exists(OC::$SERVERROOT . '/../3rdparty')) {
-            OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
-            OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
-        } else {
-            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.");
-            exit;
-        }
-        // search the apps folder
-        $config_paths = OC_Config::getValue('apps_paths', array());
-        if (!empty($config_paths)) {
-            foreach ($config_paths as $paths) {
-                if (isset($paths['url']) && isset($paths['path'])) {
-                    $paths['url'] = rtrim($paths['url'], '/');
-                    $paths['path'] = rtrim($paths['path'], '/');
-                    OC::$APPSROOTS[] = $paths;
-                }
-            }
-        } elseif (file_exists(OC::$SERVERROOT . '/apps')) {
-            OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
-        } elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
-            OC::$APPSROOTS[] = array('path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps', 'url' => '/apps', 'writable' => true);
-        }
-
-        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.");
-            exit;
-        }
-        $paths = array();
-        foreach (OC::$APPSROOTS as $path)
-            $paths[] = $path['path'];
-
-        // set the right include path
-        set_include_path(
-            OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
-                OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
-                OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
-                implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
-                get_include_path() . PATH_SEPARATOR .
-                OC::$SERVERROOT
-        );
-    }
+	/**
+	 * Associative array for autoloading. classname => filename
+	 */
+	public static $CLASSPATH = array();
+	/**
+	 * The installation path for owncloud on the server (e.g. /srv/http/owncloud)
+	 */
+	public static $SERVERROOT = '';
+	/**
+	 * the current request path relative to the owncloud root (e.g. files/index.php)
+	 */
+	private static $SUBURI = '';
+	/**
+	 * the owncloud root path for http requests (e.g. owncloud/)
+	 */
+	public static $WEBROOT = '';
+	/**
+	 * The installation path of the 3rdparty folder on the server (e.g. /srv/http/owncloud/3rdparty)
+	 */
+	public static $THIRDPARTYROOT = '';
+	/**
+	 * the root path of the 3rdparty folder for http requests (e.g. owncloud/3rdparty)
+	 */
+	public static $THIRDPARTYWEBROOT = '';
+	/**
+	 * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and
+	 * web path in 'url'
+	 */
+	public static $APPSROOTS = array();
+	/*
+	 * requested app
+	 */
+	public static $REQUESTEDAPP = '';
+	/*
+	 * requested file of app
+	 */
+	public static $REQUESTEDFILE = '';
+	/**
+	 * check if owncloud runs in cli mode
+	 */
+	public static $CLI = false;
+	/*
+	 * OC router
+	 */
+	protected static $router = null;
+
+	/**
+	 * SPL autoload
+	 */
+	public static function autoload($className)
+	{
+		if (array_key_exists($className, OC::$CLASSPATH)) {
+			$path = OC::$CLASSPATH[$className];
+			/** @TODO: Remove this when necessary
+			  Remove "apps/" from inclusion path for smooth migration to mutli app dir
+			  */
+			if (strpos($path, 'apps/') === 0) {
+				OC_Log::write('core', 'include path for class "' . $className . '" starts with "apps/"', OC_Log::DEBUG);
+				$path = str_replace('apps/', '', $path);
+			}
+		} elseif (strpos($className, 'OC_') === 0) {
+			$path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
+		} elseif (strpos($className, 'OC\\') === 0) {
+			$path = strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+		} elseif (strpos($className, 'OCP\\') === 0) {
+			$path = 'public/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+		} elseif (strpos($className, 'OCA\\') === 0) {
+			foreach(self::$APPSROOTS as $appDir) {
+				$path = $appDir['path'] . '/' . strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
+				$fullPath = stream_resolve_include_path($path);
+				if (file_exists($fullPath)) {
+					require_once $fullPath;
+					return false;
+				}
+			}
+		} elseif (strpos($className, 'Sabre_') === 0) {
+			$path = str_replace('_', '/', $className) . '.php';
+		} elseif (strpos($className, 'Symfony\\Component\\Routing\\') === 0) {
+			$path = 'symfony/routing/' . str_replace('\\', '/', $className) . '.php';
+		} elseif (strpos($className, 'Sabre\\VObject') === 0) {
+			$path = str_replace('\\', '/', $className) . '.php';
+		} elseif (strpos($className, 'Test_') === 0) {
+			$path = 'tests/lib/' . strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
+		} else {
+			return false;
+		}
+
+		if ($fullPath = stream_resolve_include_path($path)) {
+			require_once $fullPath;
+		}
+		return false;
+	}
+
+	public static function initPaths()
+	{
+		// calculate the root directories
+		OC::$SERVERROOT = str_replace("\\", '/', substr(__DIR__, 0, -4));
+		OC::$SUBURI = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
+		$scriptName = $_SERVER["SCRIPT_NAME"];
+		if (substr($scriptName, -1) == '/') {
+			$scriptName .= 'index.php';
+			//make sure suburi follows the same rules as scriptName
+			if (substr(OC::$SUBURI, -9) != 'index.php') {
+				if (substr(OC::$SUBURI, -1) != '/') {
+					OC::$SUBURI = OC::$SUBURI . '/';
+				}
+				OC::$SUBURI = OC::$SUBURI . 'index.php';
+			}
+		}
+
+		OC::$WEBROOT = substr($scriptName, 0, strlen($scriptName) - strlen(OC::$SUBURI));
+
+		if (OC::$WEBROOT != '' and OC::$WEBROOT[0] !== '/') {
+			OC::$WEBROOT = '/' . OC::$WEBROOT;
+		}
+
+		// ensure we can find OC_Config
+		set_include_path(
+			OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+			get_include_path()
+		);
+
+		// search the 3rdparty folder
+		if (OC_Config::getValue('3rdpartyroot', '') <> '' and OC_Config::getValue('3rdpartyurl', '') <> '') {
+			OC::$THIRDPARTYROOT = OC_Config::getValue('3rdpartyroot', '');
+			OC::$THIRDPARTYWEBROOT = OC_Config::getValue('3rdpartyurl', '');
+		} elseif (file_exists(OC::$SERVERROOT . '/3rdparty')) {
+			OC::$THIRDPARTYROOT = OC::$SERVERROOT;
+			OC::$THIRDPARTYWEBROOT = OC::$WEBROOT;
+		} elseif (file_exists(OC::$SERVERROOT . '/../3rdparty')) {
+			OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
+			OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
+		} else {
+			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.");
+			exit;
+		}
+		// search the apps folder
+		$config_paths = OC_Config::getValue('apps_paths', array());
+		if (!empty($config_paths)) {
+			foreach ($config_paths as $paths) {
+				if (isset($paths['url']) && isset($paths['path'])) {
+					$paths['url'] = rtrim($paths['url'], '/');
+					$paths['path'] = rtrim($paths['path'], '/');
+					OC::$APPSROOTS[] = $paths;
+				}
+			}
+		} elseif (file_exists(OC::$SERVERROOT . '/apps')) {
+			OC::$APPSROOTS[] = array('path' => OC::$SERVERROOT . '/apps', 'url' => '/apps', 'writable' => true);
+		} elseif (file_exists(OC::$SERVERROOT . '/../apps')) {
+			OC::$APPSROOTS[] = array('path' => rtrim(dirname(OC::$SERVERROOT), '/') . '/apps', 'url' => '/apps', 'writable' => true);
+		}
+
+		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.");
+			exit;
+		}
+		$paths = array();
+		foreach (OC::$APPSROOTS as $path)
+			$paths[] = $path['path'];
+
+		// set the right include path
+		set_include_path(
+			OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+			OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
+			OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
+			implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
+			get_include_path() . PATH_SEPARATOR .
+			OC::$SERVERROOT
+		);
+	}
 
 	public static function checkConfig() {
 		if (file_exists(OC::$SERVERROOT . "/config/config.php") and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
@@ -202,35 +209,41 @@ class OC
 		}
 	}
 
-    public static function checkInstalled()
-    {
-        // Redirect to installer if not installed
-        if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
-            if (!OC::$CLI) {
-                $url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php';
-                header("Location: $url");
-            }
-            exit();
-        }
-    }
-
-    public static function checkSSL()
-    {
-        // redirect to https site if configured
-        if (OC_Config::getValue("forcessl", false)) {
-            header('Strict-Transport-Security: max-age=31536000');
-            ini_set("session.cookie_secure", "on");
-            if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) {
-                $url = "https://" . OC_Request::serverHost() . $_SERVER['REQUEST_URI'];
-                header("Location: $url");
-                exit();
-            }
-        }
-    }
+	public static function checkInstalled()
+	{
+		// Redirect to installer if not installed
+		if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
+			if (!OC::$CLI) {
+				$url = 'http://' . $_SERVER['SERVER_NAME'] . OC::$WEBROOT . '/index.php';
+				header("Location: $url");
+			}
+			exit();
+		}
+	}
+
+	public static function checkSSL()
+	{
+		// redirect to https site if configured
+		if (OC_Config::getValue("forcessl", false)) {
+			header('Strict-Transport-Security: max-age=31536000');
+			ini_set("session.cookie_secure", "on");
+			if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) {
+				$url = "https://" . OC_Request::serverHost() . $_SERVER['REQUEST_URI'];
+				header("Location: $url");
+				exit();
+			}
+		}
+	}
 
 	public static function checkMaintenanceMode() {
 		// Allow ajax update script to execute without being stopped
 		if (OC_Config::getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
+			// send http status 503
+			header('HTTP/1.1 503 Service Temporarily Unavailable');
+			header('Status: 503 Service Temporarily Unavailable');
+			header('Retry-After: 120');
+
+			// render error page
 			$tmpl = new OC_Template('', 'error', 'guest');
 			$tmpl->assign('errors', array(1 => array('error' => 'ownCloud is in maintenance mode')));
 			$tmpl->printPage();
@@ -246,6 +259,7 @@ class OC
 				if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
 					OC_Config::setValue('maintenance', true);
 					OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG);
+					OC_Util::addscript('update');
 					$tmpl = new OC_Template('', 'update', 'guest');
 					$tmpl->assign('version', OC_Util::getVersionString());
 					$tmpl->printPage();
@@ -258,504 +272,525 @@ class OC
 		}
 	}
 
-    public static function initTemplateEngine()
-    {
-        // Add the stuff we need always
-        OC_Util::addScript("jquery-1.7.2.min");
-        OC_Util::addScript("jquery-ui-1.8.16.custom.min");
-        OC_Util::addScript("jquery-showpassword");
-        OC_Util::addScript("jquery.infieldlabel");
-        OC_Util::addScript("jquery-tipsy");
-        OC_Util::addScript("oc-dialogs");
-        OC_Util::addScript("js");
-        OC_Util::addScript("eventsource");
-        OC_Util::addScript("config");
-        //OC_Util::addScript( "multiselect" );
-        OC_Util::addScript('search', 'result');
-        OC_Util::addScript('router');
-
-        OC_Util::addStyle("styles");
-        OC_Util::addStyle("multiselect");
-        OC_Util::addStyle("jquery-ui-1.8.16.custom");
-        OC_Util::addStyle("jquery-tipsy");
-    }
-
-    public static function initSession()
-    {
-        // prevents javascript from accessing php session cookies
-        ini_set('session.cookie_httponly', '1;');
-
-        // set the session name to the instance id - which is unique
-        session_name(OC_Util::getInstanceId());
-
-        // (re)-initialize session
-        session_start();
-
-        // regenerate session id periodically to avoid session fixation
-        if (!isset($_SESSION['SID_CREATED'])) {
-            $_SESSION['SID_CREATED'] = time();
-        } else if (time() - $_SESSION['SID_CREATED'] > 900) {
-            session_regenerate_id(true);
-            $_SESSION['SID_CREATED'] = time();
-        }
-
-        // session timeout
-        if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
-            if (isset($_COOKIE[session_name()])) {
-                setcookie(session_name(), '', time() - 42000, '/');
-            }
-            session_unset();
-            session_destroy();
-            session_start();
-        }
-        $_SESSION['LAST_ACTIVITY'] = time();
-    }
-
-    public static function getRouter()
-    {
-        if (!isset(OC::$router)) {
-            OC::$router = new OC_Router();
-            OC::$router->loadRoutes();
-        }
-
-        return OC::$router;
-    }
-
-    public static function init()
-    {
-        // register autoloader
-        spl_autoload_register(array('OC', 'autoload'));
-        setlocale(LC_ALL, 'en_US.UTF-8');
-
-        // set some stuff
-        //ob_start();
-        error_reporting(E_ALL | E_STRICT);
-        if (defined('DEBUG') && DEBUG) {
-            ini_set('display_errors', 1);
-        }
-        self::$CLI = (php_sapi_name() == 'cli');
-
-        date_default_timezone_set('UTC');
-        ini_set('arg_separator.output', '&amp;');
-
-        // try to switch magic quotes off.
-        if (get_magic_quotes_gpc()) {
-            @set_magic_quotes_runtime(false);
-        }
-
-        //try to configure php to enable big file uploads.
-        //this doesnÂ´t work always depending on the webserver and php configuration.
-        //LetÂ´s try to overwrite some defaults anyways
-
-        //try to set the maximum execution time to 60min
-        @set_time_limit(3600);
-        @ini_set('max_execution_time', 3600);
-        @ini_set('max_input_time', 3600);
-
-        //try to set the maximum filesize to 10G
-        @ini_set('upload_max_filesize', '10G');
-        @ini_set('post_max_size', '10G');
-        @ini_set('file_uploads', '50');
-
-        //try to set the session lifetime to 60min
-        @ini_set('gc_maxlifetime', '3600');
-
-        //copy http auth headers for apache+php-fcgid work around
-        if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
-            $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
-        }
-
-        //set http auth headers for apache+php-cgi work around
-        if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) {
-            list($name, $password) = explode(':', base64_decode($matches[1]), 2);
-            $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
-            $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
-        }
-
-        //set http auth headers for apache+php-cgi work around if variable gets renamed by apache
-        if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) {
-            list($name, $password) = explode(':', base64_decode($matches[1]), 2);
-            $_SERVER['PHP_AUTH_USER'] = strip_tags($name);
-            $_SERVER['PHP_AUTH_PW'] = strip_tags($password);
-        }
-
-        self::initPaths();
-
-        register_shutdown_function(array('OC_Log', 'onShutdown'));
-        set_error_handler(array('OC_Log', 'onError'));
-        set_exception_handler(array('OC_Log', 'onException'));
-
-        // set debug mode if an xdebug session is active
-        if (!defined('DEBUG') || !DEBUG) {
-            if (isset($_COOKIE['XDEBUG_SESSION'])) {
-                define('DEBUG', true);
-            }
-        }
-
-        // register the stream wrappers
-        require_once 'streamwrappers.php';
-        stream_wrapper_register("fakedir", "OC_FakeDirStream");
-        stream_wrapper_register('static', 'OC_StaticStreamWrapper');
-        stream_wrapper_register('close', 'OC_CloseStreamWrapper');
-
-	self::checkConfig();
-        self::checkInstalled();
-        self::checkSSL();
-        self::initSession();
-        self::initTemplateEngine();
-	self::checkMaintenanceMode();
-	self::checkUpgrade();
-
-        $errors = OC_Util::checkServer();
-        if (count($errors) > 0) {
-            OC_Template::printGuestPage('', 'error', array('errors' => $errors));
-            exit;
-        }
-
-        // User and Groups
-        if (!OC_Config::getValue("installed", false)) {
-            $_SESSION['user_id'] = '';
-        }
-
-        OC_User::useBackend(new OC_User_Database());
-        OC_Group::useBackend(new OC_Group_Database());
-
-        if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SESSION['user_id']) && $_SERVER['PHP_AUTH_USER'] != $_SESSION['user_id']) {
-            OC_User::logout();
-        }
-
-        // Load Apps
-        // This includes plugins for users and filesystems as well
-        global $RUNTIME_NOAPPS;
-        global $RUNTIME_APPTYPES;
-        if (!$RUNTIME_NOAPPS) {
-            if ($RUNTIME_APPTYPES) {
-                OC_App::loadApps($RUNTIME_APPTYPES);
-            } else {
-                OC_App::loadApps();
-            }
-        }
-
-        //setup extra user backends
-        OC_User::setupBackends();
-
-        self::registerCacheHooks();
-        self::registerFilesystemHooks();
-        self::registerShareHooks();
-
-        //make sure temporary files are cleaned up
-        register_shutdown_function(array('OC_Helper', 'cleanTmp'));
-
-        //parse the given parameters
-        self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files'));
-        if (substr_count(self::$REQUESTEDAPP, '?') != 0) {
-            $app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
-            $param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
-            parse_str($param, $get);
-            $_GET = array_merge($_GET, $get);
-            self::$REQUESTEDAPP = $app;
-            $_GET['app'] = $app;
-        }
-        self::$REQUESTEDFILE = (isset($_GET['getfile']) ? $_GET['getfile'] : null);
-        if (substr_count(self::$REQUESTEDFILE, '?') != 0) {
-            $file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
-            $param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
-            parse_str($param, $get);
-            $_GET = array_merge($_GET, $get);
-            self::$REQUESTEDFILE = $file;
-            $_GET['getfile'] = $file;
-        }
-        if (!is_null(self::$REQUESTEDFILE)) {
-            $subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
-            $parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
-            if (!OC_Helper::issubdirectory($subdir, $parent)) {
-                self::$REQUESTEDFILE = null;
-                header('HTTP/1.0 404 Not Found');
-                exit;
-            }
-        }
-
-        // write error into log if locale can't be set
-        if (OC_Util::issetlocaleworking() == false) {
-            OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR);
-        }
-	if (OC_Config::getValue('installed', false)) {
-		if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
-			OC_Util::addScript('backgroundjobs');
+	public static function initTemplateEngine()
+	{
+		// Add the stuff we need always
+		OC_Util::addScript("jquery-1.7.2.min");
+		OC_Util::addScript("jquery-ui-1.10.0.custom");
+		OC_Util::addScript("jquery-showpassword");
+		OC_Util::addScript("jquery.infieldlabel");
+		OC_Util::addScript("jquery-tipsy");
+		OC_Util::addScript("oc-dialogs");
+		OC_Util::addScript("js");
+		OC_Util::addScript("eventsource");
+		OC_Util::addScript("config");
+		//OC_Util::addScript( "multiselect" );
+		OC_Util::addScript('search', 'result');
+		OC_Util::addScript('router');
+
+		OC_Util::addStyle("styles");
+		OC_Util::addStyle("multiselect");
+		OC_Util::addStyle("jquery-ui-1.10.0.custom");
+		OC_Util::addStyle("jquery-tipsy");
+		OC_Util::addScript("oc-requesttoken");
+	}
+
+	public static function initSession()
+	{
+		// prevents javascript from accessing php session cookies
+		ini_set('session.cookie_httponly', '1;');
+
+		// set the session name to the instance id - which is unique
+		session_name(OC_Util::getInstanceId());
+
+		// (re)-initialize session
+		session_start();
+
+		// regenerate session id periodically to avoid session fixation
+		if (!isset($_SESSION['SID_CREATED'])) {
+			$_SESSION['SID_CREATED'] = time();
+		} else if (time() - $_SESSION['SID_CREATED'] > 900) {
+			session_regenerate_id(true);
+			$_SESSION['SID_CREATED'] = time();
+		}
+
+		// session timeout
+		if (isset($_SESSION['LAST_ACTIVITY']) && (time() - $_SESSION['LAST_ACTIVITY'] > 3600)) {
+			if (isset($_COOKIE[session_name()])) {
+				setcookie(session_name(), '', time() - 42000, '/');
+			}
+			session_unset();
+			session_destroy();
+			session_start();
+		}
+		$_SESSION['LAST_ACTIVITY'] = time();
+	}
+
+	public static function getRouter()
+	{
+		if (!isset(OC::$router)) {
+			OC::$router = new OC_Router();
+			OC::$router->loadRoutes();
+		}
+
+		return OC::$router;
+	}
+
+
+	public static function loadAppClassPaths()
+	{	
+		foreach(OC_APP::getEnabledApps() as $app) {
+			$file = OC_App::getAppPath($app).'/appinfo/classpath.php';
+			if(file_exists($file)) {
+				require_once $file;
+			}
+		}
+	}
+
+
+	public static function init()
+	{
+		// register autoloader
+		spl_autoload_register(array('OC', 'autoload'));
+		setlocale(LC_ALL, 'en_US.UTF-8');
+
+		// set some stuff
+		//ob_start();
+		error_reporting(E_ALL | E_STRICT);
+		if (defined('DEBUG') && DEBUG) {
+			ini_set('display_errors', 1);
+		}
+		self::$CLI = (php_sapi_name() == 'cli');
+
+		date_default_timezone_set('UTC');
+		ini_set('arg_separator.output', '&amp;');
+
+		// try to switch magic quotes off.
+		if (get_magic_quotes_gpc()) {
+			@set_magic_quotes_runtime(false);
+		}
+
+		//try to configure php to enable big file uploads.
+		//this doesnÂ´t work always depending on the webserver and php configuration.
+		//LetÂ´s try to overwrite some defaults anyways
+
+		//try to set the maximum execution time to 60min
+		@set_time_limit(3600);
+		@ini_set('max_execution_time', 3600);
+		@ini_set('max_input_time', 3600);
+
+		//try to set the maximum filesize to 10G
+		@ini_set('upload_max_filesize', '10G');
+		@ini_set('post_max_size', '10G');
+		@ini_set('file_uploads', '50');
+
+		//try to set the session lifetime to 60min
+		@ini_set('gc_maxlifetime', '3600');
+
+		//copy http auth headers for apache+php-fcgid work around
+		if (isset($_SERVER['HTTP_XAUTHORIZATION']) && !isset($_SERVER['HTTP_AUTHORIZATION'])) {
+			$_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['HTTP_XAUTHORIZATION'];
+		}
+
+		//set http auth headers for apache+php-cgi work around
+		if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) {
+			list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+			$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+			$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+		}
+
+		//set http auth headers for apache+php-cgi work around if variable gets renamed by apache
+		if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) {
+			list($name, $password) = explode(':', base64_decode($matches[1]), 2);
+			$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
+			$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
+		}
+
+		self::initPaths();
+
+		register_shutdown_function(array('OC_Log', 'onShutdown'));
+		set_error_handler(array('OC_Log', 'onError'));
+		set_exception_handler(array('OC_Log', 'onException'));
+
+		// set debug mode if an xdebug session is active
+		if (!defined('DEBUG') || !DEBUG) {
+			if (isset($_COOKIE['XDEBUG_SESSION'])) {
+				define('DEBUG', true);
+			}
+		}
+
+		// register the stream wrappers
+		require_once 'streamwrappers.php';
+		stream_wrapper_register("fakedir", "OC_FakeDirStream");
+		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
+		stream_wrapper_register('close', 'OC_CloseStreamWrapper');
+
+		self::checkConfig();
+		self::checkInstalled();
+		self::checkSSL();
+		self::initSession();
+		self::initTemplateEngine();
+
+		$errors = OC_Util::checkServer();
+		if (count($errors) > 0) {
+			OC_Template::printGuestPage('', 'error', array('errors' => $errors));
+			exit;
+		}
+
+		// User and Groups
+		if (!OC_Config::getValue("installed", false)) {
+			$_SESSION['user_id'] = '';
+		}
+
+		OC_User::useBackend(new OC_User_Database());
+		OC_Group::useBackend(new OC_Group_Database());
+
+		if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SESSION['user_id']) && $_SERVER['PHP_AUTH_USER'] != $_SESSION['user_id']) {
+			OC_User::logout();
+		}
+
+		// Load Apps
+		// This includes plugins for users and filesystems as well
+		global $RUNTIME_NOAPPS;
+		global $RUNTIME_APPTYPES;
+		if (!$RUNTIME_NOAPPS) {
+			if ($RUNTIME_APPTYPES) {
+				OC_App::loadApps($RUNTIME_APPTYPES);
+			} else {
+				OC_App::loadApps();
+			}
+		}
+
+		//setup extra user backends
+		OC_User::setupBackends();
+
+		self::registerCacheHooks();
+		self::registerFilesystemHooks();
+		self::registerShareHooks();
+
+		//make sure temporary files are cleaned up
+		register_shutdown_function(array('OC_Helper', 'cleanTmp'));
+
+		//parse the given parameters
+		self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app']) ? str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])) : OC_Config::getValue('defaultapp', 'files'));
+		if (substr_count(self::$REQUESTEDAPP, '?') != 0) {
+			$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
+			$param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
+			parse_str($param, $get);
+			$_GET = array_merge($_GET, $get);
+			self::$REQUESTEDAPP = $app;
+			$_GET['app'] = $app;
+		}
+		self::$REQUESTEDFILE = (isset($_GET['getfile']) ? $_GET['getfile'] : null);
+		if (substr_count(self::$REQUESTEDFILE, '?') != 0) {
+			$file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
+			$param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
+			parse_str($param, $get);
+			$_GET = array_merge($_GET, $get);
+			self::$REQUESTEDFILE = $file;
+			$_GET['getfile'] = $file;
+		}
+		if (!is_null(self::$REQUESTEDFILE)) {
+			$subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
+			$parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
+			if (!OC_Helper::issubdirectory($subdir, $parent)) {
+				self::$REQUESTEDFILE = null;
+				header('HTTP/1.0 404 Not Found');
+				exit;
+			}
+		}
+
+		// write error into log if locale can't be set
+		if (OC_Util::issetlocaleworking() == false) {
+			OC_Log::write('core', 'setting locate to en_US.UTF-8 failed. Support is probably not installed on your system', OC_Log::ERROR);
+		}
+		if (OC_Config::getValue('installed', false)) {
+			if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
+				OC_Util::addScript('backgroundjobs');
+			}
+		}
+	}
+
+	/**
+	 * register hooks for the cache
+	 */
+	public static function registerCacheHooks()
+	{
+		// register cache cleanup jobs
+		OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
+		OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
+	}
+
+	/**
+	 * register hooks for the filesystem
+	 */
+	public static function registerFilesystemHooks()
+	{
+		// Check for blacklisted files
+		OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
+		OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
+	}
+
+	/**
+	 * register hooks for sharing
+	 */
+	public static function registerShareHooks()
+	{
+		OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
+		OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
+		OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
+		OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
+	}
+
+	/**
+	 * @brief Handle the request
+	 */
+	public static function handleRequest()
+	{
+		// load all the classpaths from the enabled apps so they are available
+		// in the routing files of each app
+		OC::loadAppClassPaths();
+
+		try {
+			OC::getRouter()->match(OC_Request::getPathInfo());
+			return;
+		} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
+			//header('HTTP/1.0 404 Not Found');
+		} catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
+			OC_Response::setStatus(405);
+			return;
+		}
+		$app = OC::$REQUESTEDAPP;
+		$file = OC::$REQUESTEDFILE;
+		$param = array('app' => $app, 'file' => $file);
+		// Handle app css files
+		if (substr($file, -3) == 'css') {
+			self::loadCSSFile($param);
+			return;
+		}
+
+		// Check if ownCloud is installed or in maintenance (update) mode
+		if (!OC_Config::getValue('installed', false)) {
+			require_once 'core/setup.php';
+			exit();
+		}
+		self::checkMaintenanceMode();
+		self::checkUpgrade();
+		
+		// Handle redirect URL for logged in users
+		if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
+			$location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
+			header('Location: ' . $location);
+			return;
+		}
+		// Handle WebDAV
+		if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
+			header('location: ' . OC_Helper::linkToRemote('webdav'));
+			return;
+		}
+
+		// Someone is logged in :
+		if (OC_User::isLoggedIn()) {
+			OC_App::loadApps();
+			OC_User::setupBackends();
+			if (isset($_GET["logout"]) and ($_GET["logout"])) {
+				if (isset($_COOKIE['oc_token'])) {
+					OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
+				}
+				OC_User::logout();
+				header("Location: " . OC::$WEBROOT . '/');
+			} else {
+				if (is_null($file)) {
+					$param['file'] = 'index.php';
+				}
+				$file_ext = substr($param['file'], -3);
+				if ($file_ext != 'php'
+					|| !self::loadAppScriptFile($param)
+				   ) {
+					header('HTTP/1.0 404 Not Found');
+				}
+			}
+			return;
+		}
+		// Not handled and not logged in
+		self::handleLogin();
+	}
+
+	public static function loadAppScriptFile($param)
+	{
+		OC_App::loadApps();
+		$app = $param['app'];
+		$file = $param['file'];
+		$app_path = OC_App::getAppPath($app);
+		$file = $app_path . '/' . $file;
+		unset($app, $app_path);
+		if (file_exists($file)) {
+			require_once $file;
+			return true;
+		}
+		return false;
+	}
+
+	public static function loadCSSFile($param)
+	{
+		$app = $param['app'];
+		$file = $param['file'];
+		$app_path = OC_App::getAppPath($app);
+		if (file_exists($app_path . '/' . $file)) {
+			$app_web_path = OC_App::getAppWebPath($app);
+			$filepath = $app_web_path . '/' . $file;
+			$minimizer = new OC_Minimizer_CSS();
+			$info = array($app_path, $app_web_path, $file);
+			$minimizer->output(array($info), $filepath);
+		}
+	}
+
+	protected static function handleLogin()
+	{
+		OC_App::loadApps(array('prelogin'));
+		$error = array();
+		// remember was checked after last login
+		if (OC::tryRememberLogin()) {
+			$error[] = 'invalidcookie';
+
+		// Someone wants to log in :
+		} elseif (OC::tryFormLogin()) {
+			$error[] = 'invalidpassword';
+
+		// The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
+		} elseif (OC::tryBasicAuthLogin()) {
+			$error[] = 'invalidpassword';
+		}
+		OC_Util::displayLoginPage(array_unique($error));
+	}
+
+	protected static function cleanupLoginTokens($user)
+	{
+		$cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
+		$tokens = OC_Preferences::getKeys($user, 'login_token');
+		foreach ($tokens as $token) {
+			$time = OC_Preferences::getValue($user, 'login_token', $token);
+			if ($time < $cutoff) {
+				OC_Preferences::deleteKey($user, 'login_token', $token);
+			}
+		}
+	}
+
+	protected static function tryRememberLogin()
+	{
+		if (!isset($_COOKIE["oc_remember_login"])
+			|| !isset($_COOKIE["oc_token"])
+			|| !isset($_COOKIE["oc_username"])
+			|| !$_COOKIE["oc_remember_login"]
+		   ) {
+			return false;
+		}
+		OC_App::loadApps(array('authentication'));
+		if (defined("DEBUG") && DEBUG) {
+			OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
+		}
+		// confirm credentials in cookie
+		if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
+			// delete outdated cookies
+			self::cleanupLoginTokens($_COOKIE['oc_username']);
+			// get stored tokens
+			$tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
+			// test cookies token against stored tokens
+			if (in_array($_COOKIE['oc_token'], $tokens, true)) {
+				// replace successfully used token with a new one
+				OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
+				$token = OC_Util::generate_random_bytes(32);
+				OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
+				OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
+				// login
+				OC_User::setUserId($_COOKIE['oc_username']);
+				OC_Util::redirectToDefaultPage();
+				// doesn't return
+			}
+			// if you reach this point you have changed your password
+			// or you are an attacker
+			// we can not delete tokens here because users may reach
+			// this point multiple times after a password change
+			OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN);
+		}
+		OC_User::unsetMagicInCookie();
+		return true;
+	}
+
+	protected static function tryFormLogin()
+	{
+		if (!isset($_POST["user"]) || !isset($_POST['password'])) {
+			return false;
+		}
+
+		OC_App::loadApps();
+
+		//setup extra user backends
+		OC_User::setupBackends();
+
+		if (OC_User::login($_POST["user"], $_POST["password"])) {
+			// setting up the time zone
+			if (isset($_POST['timezone-offset'])) {
+				$_SESSION['timezone'] = $_POST['timezone-offset'];
+			}
+
+			self::cleanupLoginTokens($_POST['user']);
+			if (!empty($_POST["remember_login"])) {
+				if (defined("DEBUG") && DEBUG) {
+					OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
+				}
+				$token = OC_Util::generate_random_bytes(32);
+				OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
+				OC_User::setMagicInCookie($_POST["user"], $token);
+			} else {
+				OC_User::unsetMagicInCookie();
+			}
+			OC_Util::redirectToDefaultPage();
+			exit();
+		}
+		return true;
+	}
+
+	protected static function tryBasicAuthLogin()
+	{
+		if (!isset($_SERVER["PHP_AUTH_USER"])
+			|| !isset($_SERVER["PHP_AUTH_PW"])
+		   ) {
+			return false;
 		}
+		OC_App::loadApps(array('authentication'));
+		if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
+			//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
+			OC_User::unsetMagicInCookie();
+			$_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '');
+			OC_Util::redirectToDefaultPage();
+		}
+		return true;
 	}
-    }
-
-    /**
-     * register hooks for the cache
-     */
-    public static function registerCacheHooks()
-    {
-        // register cache cleanup jobs
-        OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
-        OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
-    }
-
-    /**
-     * register hooks for the filesystem
-     */
-    public static function registerFilesystemHooks()
-    {
-        // Check for blacklisted files
-        OC_Hook::connect('OC_Filesystem', 'write', 'OC_Filesystem', 'isBlacklisted');
-        OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
-    }
-
-    /**
-     * register hooks for sharing
-     */
-    public static function registerShareHooks()
-    {
-        OC_Hook::connect('OC_User', 'post_deleteUser', 'OCP\Share', 'post_deleteUser');
-        OC_Hook::connect('OC_User', 'post_addToGroup', 'OCP\Share', 'post_addToGroup');
-        OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OCP\Share', 'post_removeFromGroup');
-        OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
-    }
-
-    /**
-     * @brief Handle the request
-     */
-    public static function handleRequest()
-    {
-        if (!OC_Config::getValue('installed', false)) {
-            require_once 'core/setup.php';
-            exit();
-        }
-        // Handle redirect URL for logged in users
-        if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
-            $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url']));
-            header('Location: ' . $location);
-            return;
-        }
-        // Handle WebDAV
-        if ($_SERVER['REQUEST_METHOD'] == 'PROPFIND') {
-            header('location: ' . OC_Helper::linkToRemote('webdav'));
-            return;
-        }
-        try {
-            OC::getRouter()->match(OC_Request::getPathInfo());
-            return;
-        } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
-            //header('HTTP/1.0 404 Not Found');
-        } catch (Symfony\Component\Routing\Exception\MethodNotAllowedException $e) {
-            OC_Response::setStatus(405);
-            return;
-        }
-        $app = OC::$REQUESTEDAPP;
-        $file = OC::$REQUESTEDFILE;
-        $param = array('app' => $app, 'file' => $file);
-        // Handle app css files
-        if (substr($file, -3) == 'css') {
-            self::loadCSSFile($param);
-            return;
-        }
-        // Someone is logged in :
-        if (OC_User::isLoggedIn()) {
-            OC_App::loadApps();
-            OC_User::setupBackends();
-            if (isset($_GET["logout"]) and ($_GET["logout"])) {
-		if (isset($_COOKIE['oc_token'])) {
-			OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
-		}
-                OC_User::logout();
-                header("Location: " . OC::$WEBROOT . '/');
-            } else {
-                if (is_null($file)) {
-                    $param['file'] = 'index.php';
-                }
-                $file_ext = substr($param['file'], -3);
-                if ($file_ext != 'php'
-                    || !self::loadAppScriptFile($param)
-                ) {
-                    header('HTTP/1.0 404 Not Found');
-                }
-            }
-            return;
-        }
-        // Not handled and not logged in
-        self::handleLogin();
-    }
-
-    public static function loadAppScriptFile($param)
-    {
-        OC_App::loadApps();
-        $app = $param['app'];
-        $file = $param['file'];
-        $app_path = OC_App::getAppPath($app);
-        $file = $app_path . '/' . $file;
-        unset($app, $app_path);
-        if (file_exists($file)) {
-            require_once $file;
-            return true;
-        }
-        return false;
-    }
-
-    public static function loadCSSFile($param)
-    {
-        $app = $param['app'];
-        $file = $param['file'];
-        $app_path = OC_App::getAppPath($app);
-        if (file_exists($app_path . '/' . $file)) {
-            $app_web_path = OC_App::getAppWebPath($app);
-            $filepath = $app_web_path . '/' . $file;
-            $minimizer = new OC_Minimizer_CSS();
-            $info = array($app_path, $app_web_path, $file);
-            $minimizer->output(array($info), $filepath);
-        }
-    }
-
-    protected static function handleLogin()
-    {
-        OC_App::loadApps(array('prelogin'));
-        $error = array();
-        // remember was checked after last login
-        if (OC::tryRememberLogin()) {
-            $error[] = 'invalidcookie';
-
-            // Someone wants to log in :
-        } elseif (OC::tryFormLogin()) {
-            $error[] = 'invalidpassword';
-
-            // The user is already authenticated using Apaches AuthType Basic... very usable in combination with LDAP
-        } elseif (OC::tryBasicAuthLogin()) {
-            $error[] = 'invalidpassword';
-        }
-        OC_Util::displayLoginPage(array_unique($error));
-    }
-
-    protected static function cleanupLoginTokens($user)
-    {
-        $cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
-        $tokens = OC_Preferences::getKeys($user, 'login_token');
-        foreach ($tokens as $token) {
-            $time = OC_Preferences::getValue($user, 'login_token', $token);
-            if ($time < $cutoff) {
-                OC_Preferences::deleteKey($user, 'login_token', $token);
-            }
-        }
-    }
-
-    protected static function tryRememberLogin()
-    {
-        if (!isset($_COOKIE["oc_remember_login"])
-            || !isset($_COOKIE["oc_token"])
-            || !isset($_COOKIE["oc_username"])
-            || !$_COOKIE["oc_remember_login"]
-        ) {
-            return false;
-        }
-        OC_App::loadApps(array('authentication'));
-        if (defined("DEBUG") && DEBUG) {
-            OC_Log::write('core', 'Trying to login from cookie', OC_Log::DEBUG);
-        }
-        // confirm credentials in cookie
-        if (isset($_COOKIE['oc_token']) && OC_User::userExists($_COOKIE['oc_username'])) {
-            // delete outdated cookies
-            self::cleanupLoginTokens($_COOKIE['oc_username']);
-            // get stored tokens
-            $tokens = OC_Preferences::getKeys($_COOKIE['oc_username'], 'login_token');
-            // test cookies token against stored tokens
-            if (in_array($_COOKIE['oc_token'], $tokens, true)) {
-                // replace successfully used token with a new one
-                OC_Preferences::deleteKey($_COOKIE['oc_username'], 'login_token', $_COOKIE['oc_token']);
-                $token = OC_Util::generate_random_bytes(32);
-                OC_Preferences::setValue($_COOKIE['oc_username'], 'login_token', $token, time());
-                OC_User::setMagicInCookie($_COOKIE['oc_username'], $token);
-                // login
-                OC_User::setUserId($_COOKIE['oc_username']);
-                OC_Util::redirectToDefaultPage();
-                // doesn't return
-            }
-            // if you reach this point you have changed your password
-            // or you are an attacker
-            // we can not delete tokens here because users may reach
-            // this point multiple times after a password change
-            OC_Log::write('core', 'Authentication cookie rejected for user ' . $_COOKIE['oc_username'], OC_Log::WARN);
-        }
-        OC_User::unsetMagicInCookie();
-        return true;
-    }
-
-    protected static function tryFormLogin()
-    {
-        if (!isset($_POST["user"]) || !isset($_POST['password'])) {
-            return false;
-        }
-
-        OC_App::loadApps();
-
-        //setup extra user backends
-        OC_User::setupBackends();
-
-        if (OC_User::login($_POST["user"], $_POST["password"])) {
-            // setting up the time zone
-            if (isset($_POST['timezone-offset'])) {
-                $_SESSION['timezone'] = $_POST['timezone-offset'];
-            }
-
-            self::cleanupLoginTokens($_POST['user']);
-            if (!empty($_POST["remember_login"])) {
-                if (defined("DEBUG") && DEBUG) {
-                    OC_Log::write('core', 'Setting remember login to cookie', OC_Log::DEBUG);
-                }
-                $token = OC_Util::generate_random_bytes(32);
-                OC_Preferences::setValue($_POST['user'], 'login_token', $token, time());
-                OC_User::setMagicInCookie($_POST["user"], $token);
-            } else {
-                OC_User::unsetMagicInCookie();
-            }
-            OC_Util::redirectToDefaultPage();
-            exit();
-        }
-        return true;
-    }
-
-    protected static function tryBasicAuthLogin()
-    {
-        if (!isset($_SERVER["PHP_AUTH_USER"])
-            || !isset($_SERVER["PHP_AUTH_PW"])
-        ) {
-            return false;
-        }
-        OC_App::loadApps(array('authentication'));
-        if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
-            //OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
-            OC_User::unsetMagicInCookie();
-            $_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '');
-            OC_Util::redirectToDefaultPage();
-        }
-        return true;
-    }
 
 }
 
 // define runtime variables - unless this already has been done
 if (!isset($RUNTIME_NOAPPS)) {
-    $RUNTIME_NOAPPS = false;
+	$RUNTIME_NOAPPS = false;
 }
 
 if (!function_exists('get_temp_dir')) {
-    function get_temp_dir()
-    {
-        if ($temp = ini_get('upload_tmp_dir')) return $temp;
-        if ($temp = getenv('TMP')) return $temp;
-        if ($temp = getenv('TEMP')) return $temp;
-        if ($temp = getenv('TMPDIR')) return $temp;
-        $temp = tempnam(__FILE__, '');
-        if (file_exists($temp)) {
-            unlink($temp);
-            return dirname($temp);
-        }
-        if ($temp = sys_get_temp_dir()) return $temp;
-
-        return null;
-    }
+	function get_temp_dir()
+	{
+		if ($temp = ini_get('upload_tmp_dir')) return $temp;
+		if ($temp = getenv('TMP')) return $temp;
+		if ($temp = getenv('TEMP')) return $temp;
+		if ($temp = getenv('TMPDIR')) return $temp;
+		$temp = tempnam(__FILE__, '');
+		if (file_exists($temp)) {
+			unlink($temp);
+			return dirname($temp);
+		}
+		if ($temp = sys_get_temp_dir()) return $temp;
+
+		return null;
+	}
 }
 
 OC::init();
diff --git a/lib/cache/apc.php b/lib/cache/apc.php
index 6dda0a0ff8c8fb858a93943fd282a8ef27d3079f..895d307ea26bd9c5d9a2fc6529660568e912642d 100644
--- a/lib/cache/apc.php
+++ b/lib/cache/apc.php
@@ -57,7 +57,7 @@ class OC_Cache_APC {
 if(!function_exists('apc_exists')) {
 	function apc_exists($keys)
 	{
-		$result;
+		$result=false;
 		apc_fetch($keys, $result);
 		return $result;
 	}
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 52350072fb2715550af863a91c8c579704a03629..026ec9f7ec5eb5c23f95e655fe9eb0f695499402 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -176,9 +176,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 * @brief Returns a list of properties for this nodes.;
 	 * @param array $properties
 	 * @return array
-	 * @note The properties list is a list of propertynames the client 
-	 * requested, encoded as xmlnamespace#tagName, for example: 
-	 * http://www.example.org/namespace#author If the array is empty, all 
+	 * @note The properties list is a list of propertynames the client
+	 * requested, encoded as xmlnamespace#tagName, for example:
+	 * http://www.example.org/namespace#author If the array is empty, all
 	 * properties should be returned
 	 */
 	public function getProperties($properties) {
diff --git a/lib/db.php b/lib/db.php
index 74e7ca5b0e0957db219ba60f71a49e528cd1d265..51f7c7679d4c4777380815be816b1f75dc1ea721 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -41,6 +41,8 @@ class OC_DB {
 	const BACKEND_PDO=0;
 	const BACKEND_MDB2=1;
 
+	static private $preparedQueries = array();
+
 	/**
 	 * @var MDB2_Driver_Common
 	 */
@@ -121,6 +123,7 @@ class OC_DB {
 				return true;
 			}
 		}
+		self::$preparedQueries = array();
 		// The global data we need
 		$name = OC_Config::getValue( "dbname", "owncloud" );
 		$host = OC_Config::getValue( "dbhost", "" );
@@ -181,7 +184,14 @@ class OC_DB {
 			try{
 				self::$PDO=new PDO($dsn, $user, $pass, $opts);
 			}catch(PDOException $e) {
-				OC_Template::printErrorPage( 'can not connect to database, using '.$type.'. ('.$e->getMessage().')' );
+				OC_Log::write('core', $e->getMessage(), 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();
 			}
 			// We always, really always want associative arrays
 			self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
@@ -201,6 +211,7 @@ class OC_DB {
 				return true;
 			}
 		}
+		self::$preparedQueries = array();
 		// The global data we need
 		$name = OC_Config::getValue( "dbname", "owncloud" );
 		$host = OC_Config::getValue( "dbhost", "" );
@@ -277,7 +288,13 @@ class OC_DB {
 			if( PEAR::isError( self::$MDB2 )) {
 				OC_Log::write('core', self::$MDB2->getUserInfo(), OC_Log::FATAL);
 				OC_Log::write('core', self::$MDB2->getMessage(), OC_Log::FATAL);
-				OC_Template::printErrorPage( 'can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')' );
+				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();
 			}
 
 			// We always, really always want associative arrays
@@ -321,7 +338,12 @@ class OC_DB {
 					$query.=$limitsql;
 				}
 			}
+		} else {
+			if (isset(self::$preparedQueries[$query])) {
+				return self::$preparedQueries[$query];
+			}
 		}
+		$rawQuery = $query;
 
 		// Optimize the query
 		$query = self::processQuery( $query );
@@ -343,6 +365,9 @@ class OC_DB {
 			}
 			$result=new PDOStatementWrapper($result);
 		}
+		if (is_null($limit) || $limit == -1) {
+			self::$preparedQueries[$rawQuery] = $result;
+		}
 		return $result;
 	}
 
@@ -428,6 +453,9 @@ class OC_DB {
 		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 
+		// cleanup the cached queries
+		self::$preparedQueries = array();
+
 		self::connectScheme();
 
 		// read file
@@ -588,7 +616,7 @@ class OC_DB {
 				error_log('DB error: '.$entry);
 				OC_Template::printErrorPage( $entry );
 			}
-			
+
 			if($result->numRows() == 0) {
 				$query = 'INSERT INTO "' . $table . '" ("'
 					. implode('","', array_keys($input)) . '") VALUES("'
@@ -623,7 +651,7 @@ class OC_DB {
 
 		return $result->execute();
 	}
-	
+
 	/**
 	 * @brief does minor changes to query
 	 * @param string $query Query string
diff --git a/lib/filecache.php b/lib/filecache.php
index c3256c783e63cab5c59db7a2e0701f369440cf89..7764890ef1ad962099277fb897fb5b4f51ebb987 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -23,9 +23,14 @@
  * provide caching for filesystem info in the database
  *
  * not used by OC_Filesystem for reading filesystem info,
- * instread apps should use OC_FileCache::get where possible
+ * instead apps should use OC_FileCache::get where possible
+ *
+ * It will try to keep the data up to date but changes from outside 
+ * ownCloud can invalidate the cache
+ *
+ * Methods that take $path and $root params expect $path to be relative, like 
+ * /admin/files/file.txt, if $root is false
  *
- * It will try to keep the data up to date but changes from outside ownCloud can invalidate the cache
  */
 class OC_FileCache{
 
@@ -59,7 +64,7 @@ class OC_FileCache{
 	 * @param string $path
 	 * @param array data
 	 * @param string root (optional)
-	 * @note $data is an associative array in the same format as returned 
+	 * @note $data is an associative array in the same format as returned
 	 * by get
 	 */
 	public static function put($path, $data, $root=false) {
@@ -206,7 +211,7 @@ class OC_FileCache{
 
 		OC_Cache::remove('fileid/'.$root.$path);
 	}
-	
+
 	/**
 	 * return array of filenames matching the querty
 	 * @param string $query
@@ -354,7 +359,7 @@ class OC_FileCache{
 	public static function increaseSize($path, $sizeDiff, $root=false) {
 		if($sizeDiff==0) return;
 		$item = OC_FileCache_Cached::get($path);
-		//stop walking up the filetree if we hit a non-folder or reached to root folder
+		//stop walking up the filetree if we hit a non-folder or reached the root folder
 		if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory') {
 			return;
 		}
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 742e02d471b66b86951baf832148a1861dedd3fd..503288142aaeb72426034202b6a8246c6e3bdfb2 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -76,7 +76,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 		$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
 		return $totalSpace-$usedSpace;
 	}
-	
+
 	public function postFree_space($path, $space) {
 		$free=$this->getFreeSpace($path);
 		if($free==-1) {
diff --git a/lib/files.php b/lib/files.php
index 69097e41074ce5545b3b9d37c19880c88f6ef69f..f4e0f140a44623291e98371c7dd2f0a087b9a523 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -141,7 +141,7 @@ class OC_Files {
 	*/
 	public static function get($dir, $files, $only_header = false) {
 		$xsendfile = false;
-		if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) || 
+		if (isset($_SERVER['MOD_X_SENDFILE_ENABLED']) ||
 			isset($_SERVER['MOD_X_ACCEL_REDIRECT_ENABLED'])) {
 			$xsendfile = true;
 		}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 910b3fa039dfa6ca9238571625965cb6c973ec09..4a4019a32246a67d321f8741c3273fc8389e3d7a 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -92,7 +92,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 	public function file_get_contents($path) {
 		return file_get_contents($this->datadir.$path);
 	}
-	public function file_put_contents($path, $data) {
+	public function file_put_contents($path, $data) {//trigger_error("$path = ".var_export($path, 1));
 		return file_put_contents($this->datadir.$path, $data);
 	}
 	public function unlink($path) {
diff --git a/lib/filesystem.php b/lib/filesystem.php
index aa03593908da288152355f8814c62d0345969f4d..f185d777defccca5c263ef99f97e0c725b86f692 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -179,11 +179,11 @@ class OC_Filesystem{
 		$internalPath=substr($path, strlen($mountPoint));
 		return $internalPath;
 	}
-	
+
 	static private function mountPointsLoaded($user) {
 		return in_array($user, self::$loadedUsers);
 	}
-	
+
 	/**
 	* get the storage object for a path
 	* @param string path
@@ -216,7 +216,7 @@ class OC_Filesystem{
 					self::mount($options['class'], $options['options'], $mountPoint);
 				}
 			}
-		
+
 			if(isset($mountConfig['group'])) {
 				foreach($mountConfig['group'] as $group=>$mounts) {
 					if(OC_Group::inGroup($user, $group)) {
@@ -230,7 +230,7 @@ class OC_Filesystem{
 					}
 				}
 			}
-		
+
 			if(isset($mountConfig['user'])) {
 				foreach($mountConfig['user'] as $mountUser=>$mounts) {
 					if($user==='all' or strtolower($mountUser)===strtolower($user)) {
@@ -244,16 +244,16 @@ class OC_Filesystem{
 					}
 				}
 			}
-		
+
 			$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
 			$previousMTime=OC_Appconfig::getValue('files', 'mountconfigmtime', 0);
 			if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
 				OC_FileCache::triggerUpdate();
 				OC_Appconfig::setValue('files', 'mountconfigmtime', $mtime);
 			}
-		}		
+		}
 	}
-	
+
 	static public function init($root, $user = '') {
 		if(self::$defaultInstance) {
 			return false;
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index e944ae5045d8edd00dd22365378cc99144d0c5b1..1fc8e83d68f8f58cfe36072f5d31f2a6c0b317c5 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -36,8 +36,12 @@
  *
  * Filesystem functions are not called directly; they are passed to the correct
  * OC_Filestorage object
+ *
+ * @note default root (if $root is empty or '/') is /data/[user]/
+ * @note If you don't include a leading slash, you may encounter problems.
+ * e.g. use $v = new \OC_FilesystemView( '/' . $params['uid'] ); not 
+ * $v = new \OC_FilesystemView( $params['uid'] );
  */
-
 class OC_FilesystemView {
 	private $fakeRoot='';
 	private $internal_path_cache=array();
@@ -430,10 +434,10 @@ class OC_FilesystemView {
 					$target = $this->fopen($path2.$postFix2, 'w');
 					$result = OC_Helper::streamCopy($source, $target);
 				}
-				if( $this->fakeRoot==OC_Filesystem::getRoot() ) { 
-				// If the file to be copied originates within 
+				if( $this->fakeRoot==OC_Filesystem::getRoot() ) {
+				// If the file to be copied originates within
 				// the user's data directory
-				
+
 					OC_Hook::emit(
 						OC_Filesystem::CLASSNAME,
 						OC_Filesystem::signal_post_copy,
@@ -454,33 +458,33 @@ class OC_FilesystemView {
 						OC_Filesystem::signal_post_write,
 						array( OC_Filesystem::signal_param_path => $path2)
 					);
-					
-				} else { 
-				// If this is not a normal file copy operation 
-				// and the file originates somewhere else 
-				// (e.g. a version rollback operation), do not 
+
+				} else {
+				// If this is not a normal file copy operation
+				// and the file originates somewhere else
+				// (e.g. a version rollback operation), do not
 				// perform all the other post_write actions
-					
+
 					// Update webdav properties
 					OC_Filesystem::removeETagHook(array("path" => $path2), $this->fakeRoot);
-					
+
 					$splitPath2 = explode( '/', $path2 );
-					
-					// Only cache information about files 
-					// that are being copied from within 
-					// the user files directory. Caching 
+
+					// Only cache information about files
+					// that are being copied from within
+					// the user files directory. Caching
 					// other files, like VCS backup files,
 					// serves no purpose
 					if ( $splitPath2[1] == 'files' ) {
-						
+
 						OC_FileCache_Update::update($path2, $this->fakeRoot);
-						
+
 					}
-				
+
 				}
-				
+
 				return $result;
-			
+
 			}
 		}
 	}
diff --git a/lib/group.php b/lib/group.php
index ed9482418bd4ba1a3421ac3dc89a08a29c8551f3..5afef7693610ac4018945afdf52718b0ab24bee0 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -286,4 +286,33 @@ 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 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;
+	}
 }
diff --git a/lib/group/backend.php b/lib/group/backend.php
index 9ff432d06632c2a9d50b13a98d1758e4c673990b..4f6570c3be31b36f40ec6071f884537ebd5d4096 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -133,5 +133,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;
+	}
 
 }
diff --git a/lib/group/database.php b/lib/group/database.php
index 6eca98ba01972d5e581122afaecadd4607b40404..c5dd402b212833bca00ccdab9ca119c0269ed570 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -208,4 +208,32 @@ 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 = '';
+		/*
+		
+		SELECT Persons.LastName, Persons.FirstName, Orders.OrderNo
+		FROM Persons
+		INNER JOIN Orders
+		ON Persons.P_Id=Orders.P_Id
+		ORDER BY Persons.LastName
+		*/
+		$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 ?', $limit, $offset);
+		$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;
+	}
 }
diff --git a/lib/helper.php b/lib/helper.php
index 1aba2a3810025a857b5827aea6a52ff03c0454f4..425dc138c5a972bf15eec7a9bbc3cede2195561e 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -78,11 +78,8 @@ class OC_Helper {
 			}
 		}
 
-		if (!empty($args)) {
-			$urlLinkTo .= '?';
-			foreach($args as $k => $v) {
-				$urlLinkTo .= '&'.$k.'='.urlencode($v);
-			}
+		if ($args && $query = http_build_query($args, '', '&')) {
+			$urlLinkTo .= '?'.$query;
 		}
 
 		return $urlLinkTo;
@@ -193,8 +190,9 @@ class OC_Helper {
 		if(isset($alias[$mimetype])) {
 			$mimetype=$alias[$mimetype];
 		}
-		// Replace slash with a minus
+		// Replace slash and backslash with a minus
 		$mimetype = str_replace( "/", "-", $mimetype );
+		$mimetype = str_replace( "\\", "-", $mimetype );
 
 		// Is it a dir?
 		if( $mimetype == "dir" ) {
@@ -223,6 +221,10 @@ class OC_Helper {
 	 * Makes 2048 to 2 kB.
 	 */
 	public static function humanFileSize( $bytes ) {
+		if( $bytes < 0 ) {
+			$l = OC_L10N::get('lib');
+			return $l->t("couldn't be determined");
+		}
 		if( $bytes < 1024 ) {
 			return "$bytes B";
 		}
@@ -549,7 +551,7 @@ class OC_Helper {
 		fclose($fh);
 		return $file;
 	}
-	
+
 	/**
 	 * create a temporary folder with an unique filename
 	 * @return string
@@ -625,37 +627,17 @@ class OC_Helper {
 		return $newpath;
 	}
 
-	/*
-	 * checks if $sub is a subdirectory of $parent
+	/**
+	 * @brief Checks if $sub is a subdirectory of $parent
 	 *
 	 * @param string $sub
 	 * @param string $parent
 	 * @return bool
 	 */
 	public static function issubdirectory($sub, $parent) {
-		if($sub == null || $sub == '' || $parent == null || $parent == '') {
-			return false;
-		}
-		$realpath_sub = realpath($sub);
-		$realpath_parent = realpath($parent);
-		if(($realpath_sub == false && substr_count($realpath_sub, './') != 0) || ($realpath_parent == false && substr_count($realpath_parent, './') != 0)) { //it checks for  both ./ and ../
-			return false;
-		}
-		if($realpath_sub && $realpath_sub != '' && $realpath_parent && $realpath_parent != '') {
-			if(substr($realpath_sub, 0, strlen($realpath_parent)) == $realpath_parent) {
-				return true;
-			}
-		}else{
-			if(substr($sub, 0, strlen($parent)) == $parent) {
-				return true;
-			}
+		if (strpos(realpath($sub), realpath($parent)) === 0) {
+			return true;
 		}
-		/*echo 'SUB: ' . $sub . "\n";
-		echo 'PAR: ' . $parent . "\n";
-		echo 'REALSUB: ' . $realpath_sub . "\n";
-		echo 'REALPAR: ' . $realpath_parent . "\n";
-		echo substr($realpath_sub, 0, strlen($realpath_parent));
-		exit;*/
 		return false;
 	}
 
@@ -695,8 +677,8 @@ class OC_Helper {
 		$start = intval($start);
 		$length = intval($length);
 		$string = mb_substr($string, 0, $start, $encoding) .
-		          $replacement .
-		          mb_substr($string, $start+$length, mb_strlen($string, 'UTF-8')-$start, $encoding);
+			$replacement .
+			mb_substr($string, $start+$length, mb_strlen($string, 'UTF-8')-$start, $encoding);
 
 		return $string;
 	}
@@ -764,6 +746,23 @@ class OC_Helper {
 		return $str;
 	}
 
+	/**
+	 * @brief calculates the maximum upload size respecting system settings, free space and user quota
+	 *
+	 * @param $dir the current folder where the user currently operates
+	 * @return number of bytes representing
+	 */
+	public static function maxUploadFilesize($dir) {
+		$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize'));
+		$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
+		$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
+
+		$freeSpace = OC_Filesystem::free_space($dir);
+		$freeSpace = max($freeSpace, 0);
+
+		return min($maxUploadFilesize, $freeSpace);
+	}
+
 	/**
 	 * Checks if a function is available
 	 * @param string $function_name
@@ -783,4 +782,23 @@ class OC_Helper {
 		}
 		return true;
 	}
+
+	/**
+	 * Calculate the disc space
+	 */
+	public static function getStorageInfo() {
+		$rootInfo = OC_FileCache::get('');
+		$used = $rootInfo['size'];
+		if ($used < 0) {
+			$used = 0;
+		}
+		$free = OC_Filesystem::free_space();
+		$total = $free + $used;
+		if ($total == 0) {
+			$total = 1; // prevent division by zero
+		}
+		$relative = round(($used / $total) * 10000) / 100;
+
+		return array('free' => $free, 'used' => $used, 'total' => $total, 'relative' => $relative);
+	}
 }
diff --git a/lib/image.php b/lib/image.php
index 2043a452541eae544929e69b1a0cae92e6b67754..cfc6d4773954679e5dd78a67fd6a084a862cba85 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -646,7 +646,7 @@ class OC_Image {
 		fclose($fh);
 		return $im;
 	}
-	
+
 	/**
 	* @brief Resizes the image preserving ratio.
 	* @param $maxsize The maximum size of either the width or height.
diff --git a/lib/installer.php b/lib/installer.php
index 8cffe5f06c762d3bfe0b7dd197e715204786afff..bf81cbdadafd9c64e4477b846a79dfab7e97a26f 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -267,7 +267,6 @@ class OC_Installer{
          * The function will check if an update for a version is available
          */
         public static function isUpdateAvailable( $app ) {
-
 		$ocsid=OC_Appconfig::getValue( $app, 'ocsid', '');
 
 		if($ocsid<>''){
diff --git a/lib/json.php b/lib/json.php
index 204430411c09b28a7925dafc209529cfcebe3eb1..f929e958957e99a6a1cc8cd8b919850a7f583c08 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -57,9 +57,7 @@ class OC_JSON{
 	* Check if the user is a admin, send json error msg if not
 	*/
 	public static function checkAdminUser() {
-		self::checkLoggedIn();
-		self::verifyUser();
-		if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
+		if( !OC_User::isAdminUser(OC_User::getUser())) {
 			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
@@ -70,28 +68,13 @@ class OC_JSON{
 	* Check if the user is a subadmin, send json error msg if not
 	*/
 	public static function checkSubAdminUser() {
-		self::checkLoggedIn();
-		self::verifyUser();
-		if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
+		if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
 			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
 		}
 	}
 
-	/**
-	* Check if the user verified the login with his password
-	*/
-	public static function verifyUser() {
-		if(OC_Config::getValue('enhancedauth', false) === true) {
-			if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
-				$l = OC_L10N::get('lib');
-				self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
-				exit();
-			}
-		}
-	}
-	
 	/**
 	* Send json error msg
 	*/
diff --git a/lib/l10n.php b/lib/l10n.php
index f70dfa5e34ee604022a19db580cd4d5e546236e3..ca53b3cf65cdad825b1024ed01e82d2bc42780fc 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -141,15 +141,15 @@ class OC_L10N{
 		}
 	}
 
-    /**
-     * @brief Translating
-     * @param $text String The text we need a translation for
-     * @param array $parameters default:array() Parameters for sprintf
-     * @return \OC_L10N_String Translation or the same text
-     *
-     * Returns the translation. If no translation is found, $text will be
-     * returned.
-     */
+	/**
+	 * @brief Translating
+	 * @param $text String The text we need a translation for
+	 * @param array $parameters default:array() Parameters for sprintf
+	 * @return \OC_L10N_String Translation or the same text
+	 *
+	 * Returns the translation. If no translation is found, $text will be
+	 * returned.
+	 */
 	public function t($text, $parameters = array()) {
 		return new OC_L10N_String($this, $text, $parameters);
 	}
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index b3321ef82e14e539dff7c76ef33695b90b49064f..f6401fa39b6061907862d857f6c9a5b1dae54b07 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Els fitxers s'han de baixar d'un en un.",
 "Back to Files" => "Torna a Fitxers",
 "Selected files too large to generate zip file." => "Els fitxers seleccionats son massa grans per generar un fitxer zip.",
+"couldn't be determined" => "no s'ha pogut determinar",
 "Application is not enabled" => "L'aplicaciÃ³ no estÃ  habilitada",
 "Authentication error" => "Error d'autenticaciÃ³",
 "Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pÃ gina.",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index fa11e886774adb37761eb55e3d51b6db148cb00e..2c823194b9612cd7c234fc4879b9193493ab3028 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Soubory musÃ bÃ½t stahovÃ¡ny jednotlivÄ›.",
 "Back to Files" => "ZpÄ›t k souborÅ¯m",
 "Selected files too large to generate zip file." => "VybranÃ© soubory jsou pÅ™ÃliÅ¡ velkÃ© pro vytvoÅ™enÃ zip souboru.",
+"couldn't be determined" => "nelze zjistit",
 "Application is not enabled" => "Aplikace nenÃ povolena",
 "Authentication error" => "Chyba ovÄ›Å™enÃ",
 "Token expired. Please reload page." => "Token vyprÅ¡el. Obnovte prosÃm strÃ¡nku.",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index a0ab1f17014adaafb4d82c9498812846fed2166b..8f22be5e8237da5485126d0ece3a3f988efc998d 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Filer skal downloades en for en.",
 "Back to Files" => "Tilbage til Filer",
 "Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.",
+"couldn't be determined" => "kunne ikke fastslÃ¥s",
 "Application is not enabled" => "Programmet er ikke aktiveret",
 "Authentication error" => "Adgangsfejl",
 "Token expired. Please reload page." => "Adgang er udlÃ¸bet. GenindlÃ¦s siden.",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index 4b77bf7210d65d10817418c5391ebfeb26f859aa..c285a07f63aeb69fa432ad0f8fe3886e4af9f2cf 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -9,6 +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",
 "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.",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index e9f0f34a0e1b3498dc4320bc26a1fc9a5ee8daf5..625ba2ecf2076c6be4a018e80c7bb8a1dd60cda8 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -9,6 +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 ermittelt werden",
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 315b995ecc9aad988227665fb8dcfb09b1a53b15..cf0be24b432415cd14a582ded61882725204df81 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Î¤Î± Î±ÏÏ‡ÎµÎ¯Î± Ï€ÏÎÏ€ÎµÎ¹ Î½Î± Î»Î·Ï†Î¸Î¿ÏÎ½ ÎÎ½Î±-ÎÎ½Î±.",
 "Back to Files" => "Î Î¯ÏƒÏ‰ ÏƒÏ„Î± Î‘ÏÏ‡ÎµÎ¯Î±",
 "Selected files too large to generate zip file." => "Î¤Î± ÎµÏ€Î¹Î»ÎµÎ³Î¼ÎÎ½Î± Î±ÏÏ‡ÎµÎ¯Î± ÎµÎ¯Î½Î±Î¹ Î¼ÎµÎ³Î¬Î»Î± ÏŽÏƒÏ„Îµ Î½Î± Î´Î·Î¼Î¹Î¿Ï…ÏÎ³Î·Î¸ÎµÎ¯ Î±ÏÏ‡ÎµÎ¯Î¿ zip.",
+"couldn't be determined" => "Î´ÎµÎ½ Î¼Ï€Î¿ÏÎ¿ÏÏƒÎµ Î½Î± Ï€ÏÎ¿ÏƒÎ´Î¹Î¿ÏÎ¹ÏƒÎ¸ÎµÎ¯",
 "Application is not enabled" => "Î”ÎµÎ½ ÎµÎ½ÎµÏÎ³Î¿Ï€Î¿Î¹Î®Î¸Î·ÎºÎµ Î· ÎµÏ†Î±ÏÎ¼Î¿Î³Î®",
 "Authentication error" => "Î£Ï†Î¬Î»Î¼Î± Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¯Î·ÏƒÎ·Ï‚",
 "Token expired. Please reload page." => "Î¤Î¿ Î±Î½Î±Î³Î½Ï‰ÏÎ¹ÏƒÏ„Î¹ÎºÏŒ ÎÎ»Î·Î¾Îµ. Î Î±ÏÎ±ÎºÎ±Î»ÏŽ Ï†Î¿ÏÏ„ÏŽÏƒÏ„Îµ Î¾Î±Î½Î¬ Ï„Î·Î½ ÏƒÎµÎ»Î¯Î´Î±.",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index f843c42dfd38605828e3d70988275f501afd7835..8bbc8a8f7b40946c4b29e6b89b15fc71fce0420b 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados uno por uno.",
 "Back to Files" => "Volver a Archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"couldn't be determined" => "no pudo ser determinado",
 "Application is not enabled" => "La aplicaciÃ³n no estÃ¡ habilitada",
 "Authentication error" => "Error de autenticaciÃ³n",
 "Token expired. Please reload page." => "Token expirado. Por favor, recarga la pÃ¡gina.",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index 2bbffd39e9e367b9336a6eba3917a9d34acb9c79..c32017a10f8261517cccf5aaa5dffeb95752bbcd 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Los archivos deben ser descargados de a uno.",
 "Back to Files" => "Volver a archivos",
 "Selected files too large to generate zip file." => "Los archivos seleccionados son demasiado grandes para generar el archivo zip.",
+"couldn't be determined" => "no pudo ser determinado",
 "Application is not enabled" => "La aplicaciÃ³n no estÃ¡ habilitada",
 "Authentication error" => "Error de autenticaciÃ³n",
 "Token expired. Please reload page." => "Token expirado. Por favor, recargÃ¡ la pÃ¡gina.",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 5d47ecbda23b992b15904b3c2cfa7fae13c9edd6..1941551b1760246b0adf0924d4a3aecee296d7a9 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Fitxategiak banan-banan deskargatu behar dira.",
 "Back to Files" => "Itzuli fitxategietara",
 "Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.",
+"couldn't be determined" => "ezin izan da zehaztu",
 "Application is not enabled" => "Aplikazioa ez dago gaituta",
 "Authentication error" => "Autentikazio errorea",
 "Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index ce7c7c6e970c17643d2de5eb7ecda66206f4f886..8cbdcb03b3b89f1aa2c11ea25504b44a1da6377e 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -10,6 +10,7 @@
 "seconds ago" => "Ø«Ø§Ù†ÛŒÙ‡â€ŒÙ‡Ø§ Ù¾ÛŒØ´",
 "1 minute ago" => "1 Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´",
 "%d minutes ago" => "%d Ø¯Ù‚ÛŒÙ‚Ù‡ Ù¾ÛŒØ´",
+"1 hour ago" => "1 Ø³Ø§Ø¹Øª Ù¾ÛŒØ´",
 "today" => "Ø§Ù…Ø±ÙˆØ²",
 "yesterday" => "Ø¯ÛŒØ±ÙˆØ²",
 "last month" => "Ù…Ø§Ù‡ Ù‚Ø¨Ù„",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 6a5734e978d68f736c57a097fa59175b1af4d97a..b8d4b137431cb08e0dc1764d2099333cb476494d 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Tiedostot on ladattava yksittÃ¤in.",
 "Back to Files" => "Takaisin tiedostoihin",
 "Selected files too large to generate zip file." => "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon.",
+"couldn't be determined" => "ei voitu mÃ¤Ã¤rittÃ¤Ã¤",
 "Application is not enabled" => "Sovellusta ei ole otettu kÃ¤yttÃ¶Ã¶n",
 "Authentication error" => "Todennusvirhe",
 "Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 218c22c1d53aef3e5bad0dfbbebf90886b9761f6..c6bf8f7f9c34b9e0e8e49feaea2ef8941af8f1d4 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Les fichiers nÃ©cessitent d'Ãªtre tÃ©lÃ©chargÃ©s un par un.",
 "Back to Files" => "Retour aux Fichiers",
 "Selected files too large to generate zip file." => "Les fichiers sÃ©lectionnÃ©s sont trop volumineux pour Ãªtre compressÃ©s.",
+"couldn't be determined" => "impossible Ã  dÃ©terminer",
 "Application is not enabled" => "L'application n'est pas activÃ©e",
 "Authentication error" => "Erreur d'authentification",
 "Token expired. Please reload page." => "La session a expirÃ©. Veuillez recharger la page.",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 1e897959e41b6f60a96b17037b857ca74cf7b7f0..532b3443b44718048063549bc4be94955c20936a 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Os ficheiros necesitan seren descargados de un 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 puido ser determinado",
 "Application is not enabled" => "O aplicativo non estÃ¡ activado",
 "Authentication error" => "Produciuse un erro na autenticaciÃ³n",
 "Token expired. Please reload page." => "TestemuÃ±a caducada. Recargue a pÃ¡xina.",
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 3dcf0646d06cb43b30b9e36e9da334b14804c231..e25de3e1ed6af6aa9eadfe32420c97d1a03feb07 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -5,10 +5,11 @@
 "Users" => "FelhasznÃ¡lÃ³k",
 "Apps" => "AlkalmazÃ¡sok",
 "Admin" => "Admin",
-"ZIP download is turned off." => "A ZIP-letÃ¶ltÃ©s nem engedÃ©lyezett.",
+"ZIP download is turned off." => "A ZIP-letÃ¶ltÃ©s nincs engedÃ©lyezve.",
 "Files need to be downloaded one by one." => "A fÃ¡jlokat egyenkÃ©nt kell letÃ¶lteni",
 "Back to Files" => "Vissza a FÃ¡jlokhoz",
-"Selected files too large to generate zip file." => "A kivÃ¡lasztott fÃ¡jlok tÃºl nagy a zip tÃ¶mÃ¶rÃtÃ©shez.",
+"Selected files too large to generate zip file." => "A kivÃ¡lasztott fÃ¡jlok tÃºl nagyok a zip tÃ¶mÃ¶rÃtÃ©shez.",
+"couldn't be determined" => "nem hatÃ¡rozhatÃ³ meg",
 "Application is not enabled" => "Az alkalmazÃ¡s nincs engedÃ©lyezve",
 "Authentication error" => "HitelesÃtÃ©si hiba",
 "Token expired. Please reload page." => "A token lejÃ¡rt. FrissÃtse az oldalt.",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index c0fb0babfb3051a63dca901413ba404901e5e022..eb404db7fb55c09b47c72d1d90337a4a9eac31f7 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "I file devono essere scaricati uno alla volta.",
 "Back to Files" => "Torna ai file",
 "Selected files too large to generate zip file." => "I  file selezionati sono troppo grandi per generare un file zip.",
+"couldn't be determined" => "non puÃ² essere determinato",
 "Application is not enabled" => "L'applicazione  non Ã¨ abilitata",
 "Authentication error" => "Errore di autenticazione",
 "Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 854734c976479535efd7035cd17d300a2eaab548..11cefe900c266d4c26b3cffe068f77e256cbd35f 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "ãƒ•ã‚¡ã‚¤ãƒ«ã¯1ã¤ãšã¤ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚",
 "Back to Files" => "ãƒ•ã‚¡ã‚¤ãƒ«ã«æˆ»ã‚‹",
 "Selected files too large to generate zip file." => "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã¯ZIPãƒ•ã‚¡ã‚¤ãƒ«ã®ç”Ÿæˆã«ã¯å¤§ãã™ãŽã¾ã™ã€‚",
+"couldn't be determined" => "æ¸¬å®šã§ãã¾ã›ã‚“ã§ã—ãŸ",
 "Application is not enabled" => "ã‚¢ãƒ—ãƒªã‚±ãƒ¼ã‚·ãƒ§ãƒ³ã¯ç„¡åŠ¹ã§ã™",
 "Authentication error" => "èªè¨¼ã‚¨ãƒ©ãƒ¼",
 "Token expired. Please reload page." => "ãƒˆãƒ¼ã‚¯ãƒ³ãŒç„¡åŠ¹ã«ãªã‚Šã¾ã—ãŸã€‚ãƒšãƒ¼ã‚¸ã‚’å†èªè¾¼ã—ã¦ãã ã•ã„ã€‚",
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
index baee630e89753e2e8c74d8a10ccaaac860ed3d6a..06e8b2ca094d9a8391073c08e322e135f702b014 100644
--- a/lib/l10n/lb.php
+++ b/lib/l10n/lb.php
@@ -1,6 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Help" => "HÃ«llef",
 "Personal" => "PersÃ©inlech",
 "Settings" => "Astellungen",
 "Authentication error" => "Authentifikatioun's Fehler",
-"Text" => "SMS"
+"Files" => "Dateien",
+"Text" => "SMS",
+"1 hour ago" => "vrun 1 Stonn",
+"last month" => "LÃ¤schte Mount",
+"last year" => "LÃ¤scht Joer",
+"years ago" => "Joren hier"
 );
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
index 86c7e51b4869bf17a41b9ce31b75fdf8f70c7b54..5afee1cb5a820ace492038c706e8ea4b7d01ee3e 100644
--- a/lib/l10n/ms_MY.php
+++ b/lib/l10n/ms_MY.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Help" => "Bantuan",
 "Personal" => "Peribadi",
 "Settings" => "Tetapan",
 "Users" => "Pengguna",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 087cf23a6278492ab4c495efed01ab4091ed4212..7ce134e362155e404999087c292d8fcc86324cd4 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Bestanden moeten Ã©Ã©n voor Ã©Ã©n worden gedownload.",
 "Back to Files" => "Terug naar bestanden",
 "Selected files too large to generate zip file." => "De geselecteerde bestanden zijn te groot om een zip bestand te maken.",
+"couldn't be determined" => "kon niet worden vastgesteld",
 "Application is not enabled" => "De applicatie is niet actief",
 "Authentication error" => "Authenticatie fout",
 "Token expired. Please reload page." => "Token verlopen.  Herlaad de pagina.",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 6f84a328ed9580d784a10d5668a90babbd980cfd..6ec35445bc2bdbfb383f40677b9e504d3d914940 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Pliki muszÄ… zostaÄ‡ pobrane pojedynczo.",
 "Back to Files" => "WrÃ³Ä‡ do plikÃ³w",
 "Selected files too large to generate zip file." => "Wybrane pliki sÄ… zbyt duÅ¼e, aby wygenerowaÄ‡ plik zip.",
+"couldn't be determined" => "nie moÅ¼e zostaÄ‡ znaleziony",
 "Application is not enabled" => "Aplikacja nie jest wÅ‚Ä…czona",
 "Authentication error" => "BÅ‚Ä…d uwierzytelniania",
 "Token expired. Please reload page." => "Token wygasÅ‚. ProszÄ™ ponownie zaÅ‚adowaÄ‡ stronÄ™.",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 84867c4c37c49787e663d1bf225b42536529d84f..e35bb489c49f300eb5ec102ca4dc23faeecbfc47 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Os ficheiros precisam de ser descarregados um por um.",
 "Back to Files" => "Voltar a Ficheiros",
 "Selected files too large to generate zip file." => "Os ficheiros seleccionados sÃ£o grandes demais para gerar um ficheiro zip.",
+"couldn't be determined" => "NÃ£o foi possÃvel determinar",
 "Application is not enabled" => "A aplicaÃ§Ã£o nÃ£o estÃ¡ activada",
 "Authentication error" => "Erro na autenticaÃ§Ã£o",
 "Token expired. Please reload page." => "O token expirou. Por favor recarregue a pÃ¡gina.",
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index d3ce066c8c1fa7a72b9b182c78e49088654b093e..3f8e59cdac2d3f387595a00374e40c600fc2dd07 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "FiÈ™ierele trebuie descÄƒrcate unul cÃ¢te unul.",
 "Back to Files" => "ÃŽnapoi la fiÈ™iere",
 "Selected files too large to generate zip file." => "FiÈ™ierele selectate sunt prea mari pentru a genera un fiÈ™ier zip.",
+"couldn't be determined" => "nu poate fi determinat",
 "Application is not enabled" => "AplicaÈ›ia nu este activatÄƒ",
 "Authentication error" => "Eroare la autentificare",
 "Token expired. Please reload page." => "Token expirat. Te rugÄƒm sÄƒ reÃ®ncarci pagina.",
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
index ba7d39f9eb075e4cb549c54db52e6487485dc656..03da09236ea4812dc8c5887c9751bafd7d31aad5 100644
--- a/lib/l10n/ru_RU.php
+++ b/lib/l10n/ru_RU.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Ð¤Ð°Ð¹Ð»Ñ‹ Ð´Ð¾Ð»Ð¶Ð½Ñ‹ Ð±Ñ‹Ñ‚ÑŒ Ð·Ð°Ð³Ñ€ÑƒÐ¶ÐµÐ½Ñ‹ Ð¾Ð´Ð¸Ð½ Ð·Ð° Ð´Ñ€ÑƒÐ³Ð¸Ð¼.",
 "Back to Files" => "ÐžÐ±Ñ€Ð°Ñ‚Ð½Ð¾ Ðº Ñ„Ð°Ð¹Ð»Ð°Ð¼",
 "Selected files too large to generate zip file." => "Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ ÑÐ»Ð¸ÑˆÐºÐ¾Ð¼ Ð²ÐµÐ»Ð¸ÐºÐ¸ Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ð¸Ð¸ zip-Ð°Ñ€Ñ…Ð¸Ð²Ð°.",
+"couldn't be determined" => "Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ‚ Ð±Ñ‹Ñ‚ÑŒ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¾",
 "Application is not enabled" => "ÐŸÑ€Ð¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð·Ð°Ð¿ÑƒÑ‰ÐµÐ½Ð¾",
 "Authentication error" => "ÐžÑˆÐ¸Ð±ÐºÐ° Ð°ÑƒÑ‚ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸Ð¸",
 "Token expired. Please reload page." => "ÐœÐ°Ñ€ÐºÐµÑ€ Ð¸ÑÑ‚ÐµÐº. ÐŸÐ¾Ð¶Ð°Ð»ÑƒÐ¹ÑÑ‚Ð°, Ð¿ÐµÑ€ÐµÐ·Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ.",
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 98a5b5ca677d6935ebe822c8bc49ed2684390f2d..81f23ffdc50b44cc4756eb6593f84c8f6fdfec42 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "SÃºbory musia byÅ¥ nahrÃ¡vanÃ© jeden za druhÃ½m.",
 "Back to Files" => "SpÃ¤Å¥ na sÃºbory",
 "Selected files too large to generate zip file." => "ZvolenÃ© sÃºbory sÃº prÃliÅ¾ veÄ¾kÃ© na vygenerovanie zip sÃºboru.",
+"couldn't be determined" => "nedÃ¡ sa zistiÅ¥",
 "Application is not enabled" => "AplikÃ¡cia nie je zapnutÃ¡",
 "Authentication error" => "Chyba autentifikÃ¡cie",
 "Token expired. Please reload page." => "Token vyprÅ¡al. Obnovte, prosÃm, strÃ¡nku.",
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
index 2ae7400ba79018731322bc9a939dccef8dcc9b76..34ae89a6219f5831ecaf5b723ae6d9a55dd13db4 100644
--- a/lib/l10n/sr.php
+++ b/lib/l10n/sr.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Ð”Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ Ð¼Ð¾Ñ€Ð°Ñ‚Ðµ Ð¿Ñ€ÐµÑƒÐ·Ð¸Ð¼Ð°Ñ‚Ð¸ Ñ˜ÐµÐ´Ð½Ñƒ Ð¿Ð¾ Ñ˜ÐµÐ´Ð½Ñƒ.",
 "Back to Files" => "ÐÐ°Ð·Ð°Ð´ Ð½Ð° Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ",
 "Selected files too large to generate zip file." => "Ð˜Ð·Ð°Ð±Ñ€Ð°Ð½Ðµ Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÐµ ÑÑƒ Ð¿Ñ€ÐµÐ²ÐµÐ»Ð¸ÐºÐµ Ð´Ð° Ð±Ð¸ÑÑ‚Ðµ Ð½Ð°Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð¸ ZIP Ð´Ð°Ñ‚Ð¾Ñ‚ÐµÐºÑƒ.",
+"couldn't be determined" => "Ð½Ð¸Ñ˜Ðµ Ð¾Ð´Ñ€ÐµÑ’ÐµÐ½Ð¾",
 "Application is not enabled" => "ÐÐ¿Ð»Ð¸ÐºÐ°Ñ†Ð¸Ñ˜Ð° Ð½Ð¸Ñ˜Ðµ Ð¾Ð¼Ð¾Ð³ÑƒÑ›ÐµÐ½Ð°",
 "Authentication error" => "Ð“Ñ€ÐµÑˆÐºÐ° Ð¿Ñ€Ð¸ Ð¿Ñ€Ð¾Ð²ÐµÑ€Ð¸ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ‚ÐµÑ‚Ð°",
 "Token expired. Please reload page." => "Ð–ÐµÑ‚Ð¾Ð½ Ñ˜Ðµ Ð¸ÑÑ‚ÐµÐºÐ°Ð¾. ÐŸÐ¾Ð½Ð¾Ð²Ð¾ ÑƒÑ‡Ð¸Ñ‚Ð°Ñ˜Ñ‚Ðµ ÑÑ‚Ñ€Ð°Ð½Ð¸Ñ†Ñƒ.",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 5799e2dd1a8883d594c361b1646ab1358f4c8634..36f00636b2be0144dc81910582feabd81aba7787 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Filer laddas ner en Ã¥t gÃ¥ngen.",
 "Back to Files" => "Tillbaka till Filer",
 "Selected files too large to generate zip file." => "Valda filer Ã¤r fÃ¶r stora fÃ¶r att skapa zip-fil.",
+"couldn't be determined" => "kunde inte bestÃ¤mmas",
 "Application is not enabled" => "Applikationen Ã¤r inte aktiverad",
 "Authentication error" => "Fel vid autentisering",
 "Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 75fa02f84b09ead9ff09ca63fc657278723fc895..0da607a058957f584a85dce502c2bf1962019c36 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "à¹„à¸Ÿà¸¥à¹Œà¸ªà¸²à¸¡à¸²à¸£à¸–à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹„à¸”à¹‰à¸—à¸µà¸¥à¸°à¸„à¸£à¸±à¹‰à¸‡à¹€à¸—à¹ˆà¸²à¸™à¸±à¹‰à¸™",
 "Back to Files" => "à¸à¸¥à¸±à¸šà¹„à¸›à¸—à¸µà¹ˆà¹„à¸Ÿà¸¥à¹Œ",
 "Selected files too large to generate zip file." => "à¹„à¸Ÿà¸¥à¹Œà¸—à¸µà¹ˆà¹€à¸¥à¸·à¸à¸à¸¡à¸µà¸‚à¸™à¸²à¸”à¹ƒà¸«à¸à¹ˆà¹€à¸à¸´à¸™à¸à¸§à¹ˆà¸²à¸—à¸µà¹ˆà¸ˆà¸°à¸ªà¸£à¹‰à¸²à¸‡à¹€à¸›à¹‡à¸™à¹„à¸Ÿà¸¥à¹Œ zip",
+"couldn't be determined" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸à¸³à¸«à¸™à¸”à¹„à¸”à¹‰",
 "Application is not enabled" => "à¹à¸à¸žà¸žà¸¥à¸´à¹€à¸„à¸Šà¸±à¹ˆà¸™à¸”à¸±à¸‡à¸à¸¥à¹ˆà¸²à¸§à¸¢à¸±à¸‡à¹„à¸¡à¹ˆà¹„à¸”à¹‰à¹€à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
 "Authentication error" => "à¹€à¸à¸´à¸”à¸‚à¹‰à¸à¸œà¸´à¸”à¸žà¸¥à¸²à¸”à¹ƒà¸™à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸à¸²à¸£à¹€à¸‚à¹‰à¸²à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
 "Token expired. Please reload page." => "à¸£à¸«à¸±à¸ªà¸¢à¸·à¸™à¸¢à¸±à¸™à¸„à¸§à¸²à¸¡à¸–à¸¹à¸à¸•à¹‰à¸à¸‡à¸«à¸¡à¸”à¸à¸²à¸¢à¸¸à¹à¸¥à¹‰à¸§ à¸à¸£à¸¸à¸“à¸²à¹‚à¸«à¸¥à¸”à¸«à¸™à¹‰à¸²à¹€à¸§à¹‡à¸šà¹ƒà¸«à¸¡à¹ˆà¸à¸µà¸à¸„à¸£à¸±à¹‰à¸‡",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index 9b7f1815fa36ea33d1c3d3d989c267c65b1d40a1..e55caa15972312d9e295361a04a01262b5f62203 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "DosyalarÄ±n birer birer indirilmesi gerekmektedir.",
 "Back to Files" => "Dosyalara dÃ¶n",
 "Selected files too large to generate zip file." => "SeÃ§ilen dosyalar bir zip dosyasÄ± oluÅŸturmak iÃ§in fazla bÃ¼yÃ¼ktÃ¼r.",
+"couldn't be determined" => "tespit edilemedi",
 "Application is not enabled" => "Uygulama etkinleÅŸtirilmedi",
 "Authentication error" => "Kimlik doÄŸrulama hatasÄ±",
 "Token expired. Please reload page." => "Jetonun sÃ¼resi geÃ§ti. LÃ¼tfen sayfayÄ± yenileyin.",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index f5d52f8682dd464c6b9fcf4348cabd041db09997..053644ddedec933a637035587a595f4e51c53446 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Ð¤Ð°Ð¹Ð»Ð¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ– Ð±ÑƒÑ‚Ð¸ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ– Ð¿Ð¾ÑÐ»Ñ–Ð´Ð¾Ð²Ð½Ð¾.",
 "Back to Files" => "ÐŸÐ¾Ð²ÐµÑ€Ð½ÑƒÑ‚Ð¸ÑÑ Ð´Ð¾ Ñ„Ð°Ð¹Ð»Ñ–Ð²",
 "Selected files too large to generate zip file." => "Ð’Ð¸Ð±Ñ€Ð°Ð½Ñ– Ñ„Ð°Ð»Ð¸ Ð·Ð°Ð²ÐµÐ»Ð¸ÐºÑ– Ð´Ð»Ñ Ð³ÐµÐ½ÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ zip Ñ„Ð°Ð¹Ð»Ñƒ.",
+"couldn't be determined" => "Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑƒÑ‚Ð¸ Ð²Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾",
 "Application is not enabled" => "Ð”Ð¾Ð´Ð°Ñ‚Ð¾Ðº Ð½Ðµ ÑƒÐ²Ñ–Ð¼ÐºÐ½ÐµÐ½Ð¸Ð¹",
 "Authentication error" => "ÐŸÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð°Ð²Ñ‚ÐµÐ½Ñ‚Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ—",
 "Token expired. Please reload page." => "Ð¡Ñ‚Ñ€Ð¾Ðº Ð´Ñ–Ñ— Ñ‚Ð¾ÐºÐµÐ½Ð° ÑÐºÑ–Ð½Ñ‡Ð¸Ð²ÑÑ. Ð‘ÑƒÐ´ÑŒ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑ€ÐµÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ñ‚Ðµ ÑÑ‚Ð¾Ñ€Ñ–Ð½ÐºÑƒ.",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 4dbf89c2e0e0a9fc0d9e44a4bf5c3d7eb9efcad9..62ab8fedd52150c8f73a7e9c8442338286809041 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -9,26 +9,27 @@
 "Files need to be downloaded one by one." => "æª”æ¡ˆéœ€è¦é€ä¸€ä¸‹è¼‰",
 "Back to Files" => "å›žåˆ°æª”æ¡ˆåˆ—è¡¨",
 "Selected files too large to generate zip file." => "é¸æ“‡çš„æª”æ¡ˆå¤ªå¤§ä»¥è‡´æ–¼ç„¡æ³•ç”¢ç”Ÿå£“ç¸®æª”",
+"couldn't be determined" => "ç„¡æ³•åˆ¤æ–·",
 "Application is not enabled" => "æ‡‰ç”¨ç¨‹å¼æœªå•Ÿç”¨",
 "Authentication error" => "èªè‰éŒ¯èª¤",
-"Token expired. Please reload page." => "Token éŽæœŸ. è«‹é‡æ–°æ•´ç†é é¢",
+"Token expired. Please reload page." => "Token éŽæœŸï¼Œè«‹é‡æ–°æ•´ç†é é¢ã€‚",
 "Files" => "æª”æ¡ˆ",
 "Text" => "æ–‡å—",
 "Images" => "åœ–ç‰‡",
 "seconds ago" => "å¹¾ç§’å‰",
 "1 minute ago" => "1 åˆ†é˜å‰",
 "%d minutes ago" => "%d åˆ†é˜å‰",
-"1 hour ago" => "1å°æ™‚ä¹‹å‰",
-"%d hours ago" => "%då°æ™‚ä¹‹å‰",
+"1 hour ago" => "1 å°æ™‚ä¹‹å‰",
+"%d hours ago" => "%d å°æ™‚ä¹‹å‰",
 "today" => "ä»Šå¤©",
 "yesterday" => "æ˜¨å¤©",
 "%d days ago" => "%d å¤©å‰",
 "last month" => "ä¸Šå€‹æœˆ",
-"%d months ago" => "%då€‹æœˆä¹‹å‰",
+"%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\""
+"Could not find category \"%s\"" => "æ‰¾ä¸åˆ°åˆ†é¡žï¼š\"%s\""
 );
diff --git a/lib/log.php b/lib/log.php
index e9cededa5c091587d45266d34689cb7c17d9e994..e869282e88c013c82a155b63da5d388bb43e0891 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -39,7 +39,7 @@ class OC_Log {
 			$log_class::write($app, $message, $level);
 		}
 	}
-	
+
 	//Fatal errors handler
 	public static function onShutdown() {
 		$error = error_get_last();
@@ -50,7 +50,7 @@ class OC_Log {
 			return true;
 		}
 	}
-	
+
 	// Uncaught exception handler
 	public static function onException($exception) {
 		self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL);
diff --git a/lib/mail.php b/lib/mail.php
index 4683a1b4eee21480a57b4c98e158633cf0ad70bc..1bb202ac977e193acecdf01cf1cb4847f6786dcf 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -38,8 +38,12 @@ class OC_Mail {
 		$SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' );
 		$SMTPPORT = OC_Config::getValue( 'mail_smtpport', 25 );
 		$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false );
+		$SMTPAUTHTYPE = OC_Config::getValue( 'mail_smtpauthtype', 'LOGIN' );
 		$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' );
 		$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );
+		$SMTPDEBUG    = OC_Config::getValue( 'mail_smtpdebug', false );
+		$SMTPTIMEOUT  = OC_Config::getValue( 'mail_smtptimeout', 10 );
+		$SMTPSECURE   = OC_Config::getValue( 'mail_smtpsecure', '' );
 
 
 		$mailo = new PHPMailer(true);
@@ -57,12 +61,16 @@ class OC_Mail {
 		$mailo->Host = $SMTPHOST;
 		$mailo->Port = $SMTPPORT;
 		$mailo->SMTPAuth = $SMTPAUTH;
+		$mailo->SMTPDebug = $SMTPDEBUG;
+		$mailo->SMTPSecure = $SMTPSECURE;
+		$mailo->AuthType = $SMTPAUTHTYPE;
 		$mailo->Username = $SMTPUSERNAME;
 		$mailo->Password = $SMTPPASSWORD;
+		$mailo->Timeout  = $SMTPTIMEOUT;
 
-		$mailo->From =$fromaddress;
+		$mailo->From = $fromaddress;
 		$mailo->FromName = $fromname;;
-		$mailo->Sender =$fromaddress;
+		$mailo->Sender = $fromaddress;
 		$a=explode(' ', $toaddress);
 		try {
 			foreach($a as $ad) {
diff --git a/lib/migrate.php b/lib/migrate.php
index 5ff8e338a442b887517858f709ca77a402ccabf9..87bdd016fe469f4791954f8f9d0db920b52b68df 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -219,7 +219,7 @@ class OC_Migrate{
 
 		// We need to be an admin if we are not importing our own data
 		if(($type == 'user' && self::$uid != $currentuser) || $type != 'user' ) {
-			if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
+			if( !OC_User::isAdminUser($currentuser)) {
 				// Naughty.
 				OC_Log::write( 'migration', 'Import not permitted.', OC_Log::ERROR );
 				return json_encode( array( 'success' => false ) );
@@ -655,7 +655,7 @@ class OC_Migrate{
 		$query = OC_DB::prepare( "INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )" );
 		$result = $query->execute( array( $uid, $hash));
 		if( !$result ) {
-			OC_Log::write('migration', 'Failed to create the new user "'.$uid."");
+			OC_Log::write('migration', 'Failed to create the new user "'.$uid."", OC_Log::ERROR);
 		}
 		return $result ? true : false;
 
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 00df62f0c7fafada2f669c10b64eaa8cdae2b000..e81c8f217ff2ed784552913fe7fefd13131775d0 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -66,7 +66,7 @@ class OC_Migration_Content{
 
 		// Die if we have an error (error means: bad query, not 0 results!)
 		if( PEAR::isError( $query ) ) {
-			$entry = 'DB Error: "'.$result->getMessage().'"<br />';
+			$entry = 'DB Error: "'.$query->getMessage().'"<br />';
 			$entry .= 'Offending command was: '.$query.'<br />';
 			OC_Log::write( 'migration', $entry, OC_Log::FATAL );
 			return false;
diff --git a/lib/mimetypes.list.php b/lib/mimetypes.list.php
index 77b97917583863de9e890b0d290c05006ff1c278..fc87d011ecdc13f1489c0a614112dbdb352af402 100644
--- a/lib/mimetypes.list.php
+++ b/lib/mimetypes.list.php
@@ -95,4 +95,6 @@ return array(
 	'cdr' => 'application/coreldraw',
 	'impress' => 'text/impress',
 	'ai' => 'application/illustrator',
+	'epub' => 'application/epub+zip',
+	'mobi' => 'application/x-mobipocket-ebook',
 );
diff --git a/lib/ocs/cloud.php b/lib/ocs/cloud.php
index 21095ec91e9991a3a647ed79c6279001eaf96add..2d18b1db3f2084979a66583e6fb5444c2efea487 100644
--- a/lib/ocs/cloud.php
+++ b/lib/ocs/cloud.php
@@ -24,7 +24,7 @@
 
 class OC_OCS_Cloud {
 
-	public static function getSystemWebApps($parameters) {
+	public static function getSystemWebApps() {
 		OC_Util::checkLoggedIn();
 		$apps = OC_App::getEnabledApps();
 		$values = array();
@@ -37,15 +37,15 @@ class OC_OCS_Cloud {
 		}
 		return new OC_OCS_Result($values);
 	}
-	
+
 	public static function getUserQuota($parameters) {
 		$user = OC_User::getUser();
-		if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) {
+		if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
 
 			if(OC_User::userExists($parameters['user'])) {
 				// calculate the disc space
 				$userDir = '/'.$parameters['user'].'/files';
-				OC_Filesystem::init($useDir);
+				OC_Filesystem::init($userDir);
 				$rootInfo = OC_FileCache::get('');
 				$sharedInfo = OC_FileCache::get('/Shared');
 				$used = $rootInfo['size'] - $sharedInfo['size'];
@@ -68,7 +68,7 @@ class OC_OCS_Cloud {
 			return new OC_OCS_Result(null, 300);
 		}
 	}
-	
+
 	public static function getUserPublickey($parameters) {
 
 		if(OC_User::userExists($parameters['user'])) {
@@ -79,10 +79,10 @@ class OC_OCS_Cloud {
 			return new OC_OCS_Result(null, 300);
 		}
 	}
-	
+
 	public static function getUserPrivatekey($parameters) {
 		$user = OC_User::getUser();
-		if(OC_Group::inGroup($user, 'admin') or ($user==$parameters['user'])) {
+		if(OC_User::isAdminUser($user) or ($user==$parameters['user'])) {
 
 			if(OC_User::userExists($user)) {
 				// calculate the disc space
diff --git a/lib/ocs/config.php b/lib/ocs/config.php
index 03c54aa23142fee3c88b0f0a5631e18bf970fdc6..f19121f4b2bcaf5104a5dbd82ead9df75e1879cc 100644
--- a/lib/ocs/config.php
+++ b/lib/ocs/config.php
@@ -23,7 +23,7 @@
 */
 
 class OC_OCS_Config {
-	
+
 	public static function apiConfig($parameters) {
 		$xml['version'] = '1.7';
 		$xml['website'] = 'ownCloud';
@@ -32,5 +32,5 @@ class OC_OCS_Config {
 		$xml['ssl'] = 'false';
 		return new OC_OCS_Result($xml);
 	}
-	
+
 }
diff --git a/lib/ocs/person.php b/lib/ocs/person.php
index 169cc8211db2fe78a4fb901392d7531bd6946e14..1c8210d0825371618b6b14d2fa389def6fb68323 100644
--- a/lib/ocs/person.php
+++ b/lib/ocs/person.php
@@ -38,5 +38,5 @@ class OC_OCS_Person {
 			return new OC_OCS_Result(null, 101);
 		}
 	}
-	
+
 }
diff --git a/lib/ocs/privatedata.php b/lib/ocs/privatedata.php
index e01ed5e8b0757013832ceb7d1286dbf3201001af..311b24269dd3087bdf889d0be366977a55024641 100644
--- a/lib/ocs/privatedata.php
+++ b/lib/ocs/privatedata.php
@@ -39,7 +39,7 @@ class OC_OCS_Privatedata {
 		return new OC_OCS_Result($xml);
 		//TODO: replace 'privatedata' with 'attribute' once a new libattice has been released that works with it
 	}
-	
+
 	public static function set($parameters) {
 		OC_Util::checkLoggedIn();
 		$user = OC_User::getUser();
@@ -50,7 +50,7 @@ class OC_OCS_Privatedata {
 			return new OC_OCS_Result(null, 100);
 		}
 	}
-	
+
 	public static function delete($parameters) {
 		OC_Util::checkLoggedIn();
 		$user = OC_User::getUser();
diff --git a/lib/ocs/result.php b/lib/ocs/result.php
index b08d911f785f63922d3ca41f27e123e0c2397f1c..65b2067fc3f2ecfa6f5cb5d92b94706c9ff0dae5 100644
--- a/lib/ocs/result.php
+++ b/lib/ocs/result.php
@@ -21,9 +21,9 @@
 */
 
 class OC_OCS_Result{
-	
+
 	private $data, $message, $statusCode, $items, $perPage;
-	
+
 	/**
 	 * create the OCS_Result object
 	 * @param $data mixed the data to return
@@ -33,7 +33,7 @@ class OC_OCS_Result{
 		$this->statusCode = $code;
 		$this->message = $message;
 	}
-	
+
 	/**
 	 * optionally set the total number of items available
 	 * @param $items int
@@ -41,7 +41,7 @@ class OC_OCS_Result{
 	public function setTotalItems(int $items) {
 		$this->items = $items;
 	}
-	
+
 	/**
 	 * optionally set the the number of items per page
 	 * @param $items int
@@ -49,7 +49,7 @@ class OC_OCS_Result{
 	public function setItemsPerPage(int $items) {
 		$this->perPage = $items;
 	}
-	
+
 	/**
 	 * returns the data associated with the api result
 	 * @return array
@@ -70,6 +70,6 @@ class OC_OCS_Result{
 		// Return the result data.
 		return $return;
 	}
-	
-	
+
+
 }
\ No newline at end of file
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 09ccb2be159d17a0ce1c143b3672e17de0ba1727..30163c1e403f27ffb5eabd43e3f802f31362b372 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -39,11 +39,11 @@ class OC_OCSClient{
 		return($url);
 	}
 
-        /**
-         * @brief Get the url of the OCS KB server.
-         * @returns string of the KB server
-         * This function returns the url of the OCS knowledge base server. ItÂ´s possible to set it in the config file or it will fallback to the default
-         */
+	/**
+	 * @brief Get the url of the OCS KB server.
+	 * @returns string of the KB server
+	 * This function returns the url of the OCS knowledge base server. ItÂ´s possible to set it in the config file or it will fallback to the default
+	 */
 	private static function getKBURL() {
 		$url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
 		return($url);
@@ -59,7 +59,7 @@ class OC_OCSClient{
 		return($data);
 	}
 
-        /**
+	/**
 	 * @brief Get all the categories from the OCS server
 	 * @returns array with category ids
 	 * @note returns NULL if config value appstoreenabled is set to false
@@ -246,7 +246,7 @@ class OC_OCSClient{
 			}
 			$kbe['totalitems'] = $data->meta->totalitems;
 		}
-                return $kbe;
+		return $kbe;
 	}
 
 
diff --git a/lib/public/api.php b/lib/public/api.php
index a85daa1935cbc7456fc19f81d706db4f90dcc095..95d333f21658afaa35adfbe7bc5d72b798274c19 100644
--- a/lib/public/api.php
+++ b/lib/public/api.php
@@ -26,7 +26,7 @@ namespace OCP;
  * This class provides functions to manage apps in ownCloud
  */
 class API {
-        
+
 	/**
 	 * registers an api call
 	 * @param string $method the http method
@@ -40,5 +40,5 @@ class API {
 	public static function register($method, $url, $action, $app, $authLevel = OC_API::USER_AUTH, $defaults = array(), $requirements = array()){
 		\OC_API::register($method, $url, $action, $app, $authLevel, $defaults, $requirements);
 	}
-     
+
 }
diff --git a/lib/public/app.php b/lib/public/app.php
index 809a656f17f52da143e27c105295a677345b7079..a1ecf524cc84110440378a9452aad77b05068a49 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -89,7 +89,7 @@ class App {
 	 * @param $page string page to be included
 	*/
 	public static function registerPersonal( $app, $page ) {
-		return \OC_App::registerPersonal( $app, $page );
+		\OC_App::registerPersonal( $app, $page );
 	}
 
 	/**
@@ -98,7 +98,7 @@ class App {
 	 * @param $page string page to be included
 	 */
 	public static function registerAdmin( $app, $page ) {
-		return \OC_App::registerAdmin( $app, $page );
+		\OC_App::registerAdmin( $app, $page );
 	}
 
 	/**
@@ -125,10 +125,9 @@ class App {
 	/**
 	 * @brief Check if the app is enabled, redirects to home if not
 	 * @param $app app
-	 * @returns true/false
 	*/
 	public static function checkAppEnabled( $app ) {
-		return \OC_Util::checkAppEnabled( $app );
+		\OC_Util::checkAppEnabled( $app );
 	}
 
 	/**
diff --git a/lib/public/constants.php b/lib/public/constants.php
index bc979c9031fcc8ce94647a7911a393f0052cce1f..1495c620dc9a65fbb3cea4c7e82f2531d190bf81 100644
--- a/lib/public/constants.php
+++ b/lib/public/constants.php
@@ -35,4 +35,3 @@ const PERMISSION_UPDATE = 2;
 const PERMISSION_DELETE = 8;
 const PERMISSION_SHARE = 16;
 const PERMISSION_ALL = 31;
-
diff --git a/lib/public/db.php b/lib/public/db.php
index 5d4aadd22ae723d7e008ff0fdde825ff1fe8f253..932e79d9ef1755828ea34751881911d47a3ad4e2 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -49,9 +49,9 @@ class DB {
 	 * @brief Insert a row if a matching row doesn't exists.
 	 * @param $table string The table name (will replace *PREFIX*) to perform the replace on.
 	 * @param $input array
-	 * 
+	 *
 	 * The input array if in the form:
-	 * 
+	 *
 	 * array ( 'id' => array ( 'value' => 6,
 	 *	'key' => true
 	 *	),
@@ -65,7 +65,7 @@ class DB {
 	public static function insertIfNotExist($table, $input) {
 		return(\OC_DB::insertIfNotExist($table, $input));
 	}
-	
+
 	/**
 	 * @brief gets last value of autoincrement
 	 * @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix
diff --git a/lib/public/files.php b/lib/public/files.php
index 90889c59ad851a47a07812e9f8ef87ce8f82584f..75e1d2fbbc1095783789295d958c15ee9dd9a040 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -38,9 +38,10 @@ class Files {
 	 * @brief Recusive deletion of folders
 	 * @param string $dir path to the folder
 	 *
+	 * @return bool
 	 */
 	static function rmdirr( $dir ) {
-		\OC_Helper::rmdirr( $dir );
+		return \OC_Helper::rmdirr( $dir );
 	}
 
 	/**
diff --git a/lib/public/response.php b/lib/public/response.php
index bfb84eda5d1753c334497e62e066365a0363e4d4..de0c3f253471c83a49de84b0bab357f80d15272e 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -42,7 +42,7 @@ class Response {
 	*  null		cache indefinitly
 	*/
 	static public function enableCaching( $cache_time = null ) {
-		return(\OC_Response::enableCaching( $cache_time ));
+		\OC_Response::enableCaching( $cache_time );
 	}
 
 	/**
@@ -51,7 +51,7 @@ class Response {
 	* @param string $lastModified time when the reponse was last modified
 	*/
 	static public function setLastModifiedHeader( $lastModified ) {
-		return(\OC_Response::setLastModifiedHeader( $lastModified ));
+		\OC_Response::setLastModifiedHeader( $lastModified );
 	}
 
 	/**
@@ -59,7 +59,7 @@ class Response {
 	* @see enableCaching with cache_time = 0
 	*/
 	static public function disableCaching() {
-		return(\OC_Response::disableCaching());
+		\OC_Response::disableCaching();
 	}
 
 	/**
@@ -68,7 +68,7 @@ class Response {
 	* @param string $etag token to use for modification check
 	*/
 	static public function setETagHeader( $etag ) {
-		return(\OC_Response::setETagHeader( $etag ));
+		\OC_Response::setETagHeader( $etag );
 	}
 
 	/**
@@ -76,7 +76,7 @@ class Response {
 	* @param string $filepath of file to send
 	*/
 	static public function sendFile( $filepath ) {
-		return(\OC_Response::sendFile( $filepath ));
+		\OC_Response::sendFile( $filepath );
 	}
 
 	/**
@@ -86,7 +86,7 @@ class Response {
 	*  DateTime object when to expire response
 	*/
 	static public function setExpiresHeader( $expires ) {
-		return(\OC_Response::setExpiresHeader( $expires ));
+		\OC_Response::setExpiresHeader( $expires );
 	}
 
 	/**
@@ -94,6 +94,6 @@ class Response {
 	* @param string $location to redirect to
 	*/
 	static public function redirect( $location ) {
-		return(\OC_Response::redirect( $location ));
+		\OC_Response::redirect( $location );
 	}
 }
diff --git a/lib/public/share.php b/lib/public/share.php
index 8c0cfc16b4eb3d77d49fba6e7c505fc134635a63..e1d77e652d58055ec4e019f164b3fd466db747b7 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -351,14 +351,14 @@ class Share {
 					//delete the old share
 					self::delete($checkExists['id']);
 				}
-				
+
 				// Generate hash of password - same method as user passwords
 				if (isset($shareWith)) {
 					$forcePortable = (CRYPT_BLOWFISH != 1);
 					$hasher = new \PasswordHash(8, $forcePortable);
 					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
 				}
-				
+
 				// Generate token
 				if (isset($oldToken)) {
 					$token = $oldToken;
@@ -415,7 +415,7 @@ class Share {
 			if ($parentFolder && $files = \OC_Files::getDirectoryContent($itemSource)) {
 				for ($i = 0; $i < count($files); $i++) {
 					$name = substr($files[$i]['name'], strpos($files[$i]['name'], $itemSource) - strlen($itemSource));
-					if ($files[$i]['mimetype'] == 'httpd/unix-directory' 
+					if ($files[$i]['mimetype'] == 'httpd/unix-directory'
 						&& $children = \OC_Files::getDirectoryContent($name, '/')
 					) {
 						// Continue scanning into child folders
@@ -748,7 +748,7 @@ class Share {
 					$itemTypes = $collectionTypes;
 				}
 				$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
-				$where .= ' WHERE `item_type` IN ('.$placeholders.'))';
+				$where = ' WHERE `item_type` IN ('.$placeholders.'))';
 				$queryArgs = $itemTypes;
 			} else {
 				$where = ' WHERE `item_type` = ?';
@@ -864,7 +864,7 @@ class Share {
 				}
 			} else {
 				if ($fileDependent) {
-					if (($itemType == 'file' || $itemType == 'folder') 
+					if (($itemType == 'file' || $itemType == 'folder')
 						&& $format == \OC_Share_Backend_File::FORMAT_FILE_APP
 						|| $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT
 					) {
@@ -946,6 +946,15 @@ class Share {
 					continue;
 				}
 			}
+
+			// Add display names to result
+			if ( isset($row['share_with']) && $row['share_with'] != '') {
+				$row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']);
+			}
+			if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
+				$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
+			}
+			
 			$items[$row['id']] = $row;
 		}
 		if (!empty($items)) {
diff --git a/lib/public/user.php b/lib/public/user.php
index 9e50115ab7053e7a4eb13d9615ad9296b5665761..de52055a4c5cd488992f4bbc0781e193c2e1f120 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -51,7 +51,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 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
@@ -65,7 +83,7 @@ class User {
 	/**
 	 * @brief check if a user exists
 	 * @param string $uid the username
-	 * @param string $excludingBackend (default none) 
+	 * @param string $excludingBackend (default none)
 	 * @return boolean
 	 */
 	public static function userExists( $uid, $excludingBackend = null ) {
@@ -73,12 +91,10 @@ class User {
 	}
 	/**
 	 * @brief Loggs the user out including all the session data
-	 * @returns true
-	 *
 	 * Logout, destroys session
 	 */
 	public static function logout() {
-		return \OC_USER::logout();
+		\OC_USER::logout();
 	}
 
 	/**
diff --git a/lib/public/util.php b/lib/public/util.php
index df09ea81ae1ac265be398b774e5e66aeb9a95c45..413dbcccd282216c766f2f6ff269742616d9ef6f 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -203,7 +203,7 @@ class Util {
 		$host_name = self::getServerHostName();
 		// handle localhost installations
 		if ($host_name === 'localhost') {
-            $host_name = "example.com";
+			$host_name = "example.com";
 		}
 		return $user_part.'@'.$host_name;
 	}
@@ -298,7 +298,7 @@ class Util {
 	 * Todo: Write howto
 	 */
 	public static function callCheck() {
-		return(\OC_Util::callCheck());
+		\OC_Util::callCheck();
 	}
 
 	/**
@@ -367,4 +367,14 @@ class Util {
 	public static function recursiveArraySearch($haystack, $needle, $index = null) {
 		return(\OC_Helper::recursiveArraySearch($haystack, $needle, $index));
 	}
+
+	/**
+	 * @brief calculates the maximum upload size respecting system settings, free space and user quota
+	 *
+	 * @param $dir the current folder where the user currently operates
+	 * @return number of bytes representing
+	 */
+	public static function maxUploadFilesize($dir) {
+		return \OC_Helper::maxUploadFilesize($dir);
+	}
 }
diff --git a/lib/request.php b/lib/request.php
index 99a77e1b59ecb013304aaaa92a5c3cd50849cefb..f2f15c21103873f64f65962ca3f4f928bee5c049 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -19,7 +19,7 @@ class OC_Request {
 			return 'localhost';
 		}
 		if(OC_Config::getValue('overwritehost', '')<>'') {
-			return OC_Config::getValue('overwritehost'); 
+			return OC_Config::getValue('overwritehost');
 		}
 		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
 			if (strpos($_SERVER['HTTP_X_FORWARDED_HOST'], ",") !== false) {
@@ -44,7 +44,7 @@ class OC_Request {
 	*/
 	public static function serverProtocol() {
 		if(OC_Config::getValue('overwriteprotocol', '')<>'') {
-			return OC_Config::getValue('overwriteprotocol'); 
+			return OC_Config::getValue('overwriteprotocol');
 		}
 		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
 			$proto = strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']);
diff --git a/lib/router.php b/lib/router.php
index 27e14c38abf0aef0773017232af51236bb6ee984..746b68c2c0c4a8078f0c738d5b991d9808814f0f 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -49,6 +49,7 @@ class OC_Router {
 			$files = $this->getRoutingFiles();
 			$files[] = 'settings/routes.php';
 			$files[] = 'core/routes.php';
+			$files[] = 'ocs/routes.php';
 			$this->cache_key = OC_Cache::generateCacheKeyFromFiles($files);
 		}
 		return $this->cache_key;
@@ -58,23 +59,6 @@ class OC_Router {
 	 * loads the api routes
 	 */
 	public function loadRoutes() {
-
-		// TODO cache
-		$this->root = $this->getCollection('root');
-		foreach(OC_APP::getEnabledApps() as $app){
-			$file = OC_App::getAppPath($app).'/appinfo/routes.php';
-			if(file_exists($file)){
-				$this->useCollection($app);
-				require_once($file);
-				$collection = $this->getCollection($app);
-				$this->root->addCollection($collection, '/apps/'.$app);
-			}
-		}
-		// include ocs routes
-		require_once(OC::$SERVERROOT.'/ocs/routes.php');
-		$collection = $this->getCollection('ocs');
-		$this->root->addCollection($collection, '/ocs');
-
 		foreach($this->getRoutingFiles() as $app => $file) {
 			$this->useCollection($app);
 			require_once $file;
@@ -85,6 +69,10 @@ class OC_Router {
 		require_once 'settings/routes.php';
 		require_once 'core/routes.php';
 
+		// include ocs routes
+		require_once 'ocs/routes.php';
+		$collection = $this->getCollection('ocs');
+		$this->root->addCollection($collection, '/ocs');
 	}
 
 	protected function getCollection($name) {
diff --git a/lib/setup.php b/lib/setup.php
index fdd10be6824b84e90682c11a5be949188a0fb80f..4dd190b99fb159b858c28e79f1b52d6fd8ca2897 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -1,5 +1,23 @@
 <?php
 
+class DatabaseSetupException extends Exception
+{
+	private $hint;
+
+	public function __construct($message, $hint, $code = 0, Exception $previous = null) {
+		$this->hint = $hint;
+		parent::__construct($message, $code, $previous);
+	}
+
+	public function __toString() {
+		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+	}
+
+	public function getHint() {
+		return $this->hint;
+	}
+}
+
 class OC_Setup {
 	public static function install($options) {
 		$error = array();
@@ -19,9 +37,9 @@ class OC_Setup {
 			if($dbtype=='mysql')
 				$dbprettyname = 'MySQL';
 			else if($dbtype=='pgsql')
-					$dbprettyname = 'PostgreSQL';
+				$dbprettyname = 'PostgreSQL';
 			else
-					$dbprettyname = 'Oracle';
+				$dbprettyname = 'Oracle';
 
 
 			if(empty($options['dbuser'])) {
@@ -69,10 +87,16 @@ class OC_Setup {
 
 				try {
 					self::setupMySQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username);
+				} catch (DatabaseSetupException $e) {
+					$error[] = array(
+						'error' => $e->getMessage(),
+						'hint' => $e->getHint()
+					);	
+					return($error);
 				} catch (Exception $e) {
 					$error[] = array(
-						'error' => 'MySQL username and/or password not valid',
-						'hint' => 'You need to enter either an existing account or the administrator.'
+						'error' => $e->getMessage(),
+						'hint' => ''
 					);
 					return($error);
 				}
@@ -141,7 +165,9 @@ class OC_Setup {
 			if(count($error) == 0) {
 				OC_Appconfig::setValue('core', 'installedat', microtime(true));
 				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);
@@ -153,7 +179,7 @@ class OC_Setup {
 				if (isset($_SERVER['SERVER_SOFTWARE']) && strstr($_SERVER['SERVER_SOFTWARE'], 'Apache')) {
 					self::createHtaccess();
 				}
-				
+
 				//and we are done
 				OC_Config::setValue('installed', true);
 			}
@@ -166,7 +192,7 @@ class OC_Setup {
 		//check if the database user has admin right
 		$connection = @mysql_connect($dbhost, $dbuser, $dbpass);
 		if(!$connection) {
-			throw new Exception('MySQL username and/or password not valid');
+			throw new DatabaseSetupException('MySQL username and/or password not valid','You need to enter either an existing account or the administrator.');
 		}
 		$oldUser=OC_Config::getValue('dbuser', false);
 
@@ -229,8 +255,14 @@ class OC_Setup {
 		// the anonymous user would take precedence when there is one.
 		$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
 		$result = mysql_query($query, $connection);
+		if (!$result) {
+			throw new DatabaseSetupException("MySQL user '" . "$name" . "'@'localhost' already exists","Delete this user from MySQL.");
+		}
 		$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
 		$result = mysql_query($query, $connection);
+		if (!$result) {
+			throw new DatabaseSetupException("MySQL user '" . "$name" . "'@'%' already exists","Delete this user from MySQL.");
+		}
 	}
 
 	private static function setupPostgreSQLDatabase($dbhost, $dbuser, $dbpass, $dbname, $dbtableprefix, $username) {
diff --git a/lib/subadmin.php b/lib/subadmin.php
index 9e83e6da430f166e3d088778c8c129e56b15687e..8cda7240ac92f8865ae61f3d6102129ec4aba5f1 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -122,6 +122,11 @@ class OC_SubAdmin{
 	 * @return bool
 	 */
 	public static function isSubAdmin($uid) {
+		// Check if the user is already an admin
+		if(OC_Group::inGroup($uid, 'admin' )) {
+			return true;
+		}
+
 		$stmt = OC_DB::prepare('SELECT COUNT(*) AS `count` FROM `*PREFIX*group_admin` WHERE `uid` = ?');
 		$result = $stmt->execute(array($uid));
 		$result = $result->fetchRow();
@@ -141,7 +146,7 @@ class OC_SubAdmin{
 		if(!self::isSubAdmin($subadmin)) {
 			return false;
 		}
-		if(OC_Group::inGroup($user, 'admin')) {
+		if(OC_User::isAdminUser($user)) {
 			return false;
 		}
 		$accessiblegroups = self::getSubAdminsGroups($subadmin);
diff --git a/lib/template.php b/lib/template.php
index 04667d73a2c46f5de9a03944b430907005c4a972..238d8a8ad0f5ece69cc509b235c1057eb2af64be 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -85,15 +85,25 @@ function human_file_size( $bytes ) {
 }
 
 function simple_file_size($bytes) {
-	$mbytes = round($bytes/(1024*1024), 1);
-	if($bytes == 0) { return '0'; }
-	else if($mbytes < 0.1) { return '&lt; 0.1'; }
-	else if($mbytes > 1000) { return '&gt; 1000'; }
-	else { return number_format($mbytes, 1); }
+	if ($bytes < 0) {
+		return '?';
+	}
+	$mbytes = round($bytes / (1024 * 1024), 1);
+	if ($bytes == 0) {
+		return '0';
+	}
+	if ($mbytes < 0.1) {
+		return '&lt; 0.1';
+	}
+	if ($mbytes > 1000) {
+		return '&gt; 1000';
+	} else {
+		return number_format($mbytes, 1);
+	}
 }
 
 function relative_modified_date($timestamp) {
-    $l=OC_L10N::get('lib');
+	$l=OC_L10N::get('lib');
 	$timediff = time() - $timestamp;
 	$diffminutes = round($timediff/60);
 	$diffhours = round($diffminutes/60);
@@ -176,9 +186,15 @@ class OC_Template{
 		$this->l10n = OC_L10N::get($parts[0]);
 
 		// Some headers to enhance security
-		header('X-Frame-Options: Sameorigin');
-		header('X-XSS-Protection: 1; mode=block');
-		header('X-Content-Type-Options: nosniff');
+		header('X-Frame-Options: Sameorigin'); // Disallow iFraming from other domains
+		header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters
+		header('X-Content-Type-Options: nosniff'); // Disable sniffing the content type for IE
+
+		// Content Security Policy
+		// If you change the standard policy, please also change it in config.sample.php
+		$policy = OC_Config::getValue('custom_csp_policy',  'default-src \'self\'; script-src \'self\' \'unsafe-eval\'; style-src \'self\' \'unsafe-inline\'; frame-src *; img-src *');
+		header('Content-Security-Policy:'.$policy); // Standard
+		header('X-WebKit-CSP:'.$policy); // Older webkit browsers
 
 		$this->findTemplate($name);
 	}
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 4173e008ba75754572be366478cb72309a490707..37ece91047f4b4c012a2116b1eb724307fe90ff3 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -33,18 +33,6 @@ class OC_TemplateLayout extends OC_Template {
 		} else {
 			parent::__construct('core', 'layout.base');
 		}
-
-		$apps_paths = array();
-		foreach(OC_App::getEnabledApps() as $app) {
-			$apps_paths[$app] = OC_App::getAppWebPath($app);
-		}
-		$this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution
-
-		if (OC_Config::getValue('installed', false) && !OC_AppConfig::getValue('core', 'remote_core.css', false)) {
-			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
-			OC_AppConfig::setValue('core', 'remote_core.js', '/core/minimizer.php');
-		}
-
 		// Add the js files
 		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
diff --git a/lib/user.php b/lib/user.php
index 80f88ca7052da3e46dc98ac60da179a7680399ac..38259bceea5ac238491b86b8b6cf8ab07d78e9b4 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -251,6 +251,7 @@ class OC_User {
 			if($uid && $enabled) {
 				session_regenerate_id(true);
 				self::setUserId($uid);
+				self::setDisplayName($uid);
 				OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password ));
 				return true;
 			}
@@ -260,17 +261,55 @@ class OC_User {
 
 	/**
 	 * @brief Sets user id for session and triggers emit
-	 * @returns true
-	 *
 	 */
 	public static function setUserId($uid) {
 		$_SESSION['user_id'] = $uid;
-		return true;
+	}
+
+	/**
+	 * @brief Sets user display name for session
+	 */
+	public static function setDisplayName($uid, $displayName = null) {
+		$result = false;
+		if ($displayName ) {
+			foreach(self::$_usedBackends as $backend) {
+				if($backend->implementsActions(OC_USER_BACKEND_SET_DISPLAYNAME)) {
+					if($backend->userExists($uid)) {
+						$success |= $backend->setDisplayName($uid, $displayName);
+					}
+				}
+			}
+		} else {
+			$displayName = self::determineDisplayName($uid);
+			$result = true;
+		}
+		if (OC_User::getUser() === $uid) {
+			$_SESSION['display_name'] = $displayName;
+		}
+		return $result;
+	}
+
+
+	/**
+	 * @brief get display name
+	 * @param $uid The username
+	 * @returns string display name or uid if no display name is defined
+	 *
+	 */
+	private static function determineDisplayName( $uid ) {
+		foreach(self::$_usedBackends as $backend) {
+			if($backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
+				$result=$backend->getDisplayName( $uid );
+				if($result) {
+					return $result;
+				}
+			}
+		}
+		return $uid;
 	}
 
 	/**
 	 * @brief Logs the current user out and kills all the session data
-	 * @returns true
 	 *
 	 * Logout, destroys session
 	 */
@@ -279,7 +318,6 @@ class OC_User {
 		session_unset();
 		session_destroy();
 		OC_User::unsetMagicInCookie();
-		return true;
 	}
 
 	/**
@@ -299,6 +337,19 @@ class OC_User {
 		return false;
 	}
 
+	/**
+	 * @brief Check if the user is an admin user
+	 * @param $uid uid of the admin
+	 * @returns bool
+	 */
+	public static function isAdminUser($uid) {
+		if(OC_Group::inGroup($uid, 'admin' )) {
+			return true;
+		}
+		return false;
+	}
+
+
 	/**
 	 * @brief get the user id of the user currently logged in.
 	 * @return string uid or false
@@ -312,6 +363,21 @@ class OC_User {
 		}
 	}
 
+	/**
+	 * @brief get the display name of the user currently logged in.
+	 * @return string uid or false
+	 */
+	public static function getDisplayName($user=null) {
+		if ( $user ) {
+			return self::determineDisplayName($user);
+		} else if( isset($_SESSION['display_name']) AND $_SESSION['display_name'] ) {
+			return $_SESSION['display_name'];
+		}
+		else{
+			return false;
+		}
+	}
+
 	/**
 	 * @brief Autogenerate a password
 	 * @returns string
@@ -375,8 +441,8 @@ class OC_User {
 
 	/**
 	 * @brief Check if the password is correct
-	 * @param $uid The username
-	 * @param $password The password
+	 * @param string $uid The username
+	 * @param string $password The password
 	 * @returns string
 	 *
 	 * returns the path to the users home directory
@@ -411,6 +477,24 @@ class OC_User {
 		return $users;
 	}
 
+	/**
+	 * @brief Get a list of all users display name
+	 * @returns associative array with all display names (value) and corresponding uids (key)
+	 *
+	 * Get a list of all display names and user ids.
+	 */
+	public static function getDisplayNames($search = '', $limit = null, $offset = null) {
+		$displayNames = array();
+		foreach (self::$_usedBackends as $backend) {
+			$backendDisplayNames = $backend->getDisplayNames($search, $limit, $offset);
+			if (is_array($backendDisplayNames)) {
+				$displayNames = array_merge($displayNames, $backendDisplayNames);
+			}
+		}
+		ksort($displayNames);
+		return $displayNames;
+	}
+
 	/**
 	 * @brief check if a user exists
 	 * @param string $uid the username
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 2a95db936904b547c6efc20daa9be73dd09bec0a..56fa3195978fcf95bf373293d404d3b6910f0eb6 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -35,6 +35,8 @@ define('OC_USER_BACKEND_CREATE_USER',       0x000001);
 define('OC_USER_BACKEND_SET_PASSWORD',      0x000010);
 define('OC_USER_BACKEND_CHECK_PASSWORD',    0x000100);
 define('OC_USER_BACKEND_GET_HOME',			0x001000);
+define('OC_USER_BACKEND_GET_DISPLAYNAME',	0x010000);
+define('OC_USER_BACKEND_SET_DISPLAYNAME',	0x010000);
 
 
 /**
@@ -50,6 +52,8 @@ abstract class OC_User_Backend implements OC_User_Interface {
 		OC_USER_BACKEND_SET_PASSWORD => 'setPassword',
 		OC_USER_BACKEND_CHECK_PASSWORD => 'checkPassword',
 		OC_USER_BACKEND_GET_HOME => 'getHome',
+		OC_USER_BACKEND_GET_DISPLAYNAME => 'getDisplayName',
+		OC_USER_BACKEND_SET_DISPLAYNAME => 'setDisplayName',
 	);
 
 	/**
@@ -120,4 +124,28 @@ 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
+	 * @return display name
+	 */
+	public function getDisplayName($uid) {
+		return $uid;
+	}
+	
+	/**
+	 * @brief Get a list of all display names
+	 * @returns array with  all displayNames (value) and the correspondig uids (key)
+	 *
+	 * Get a list of all display names and user ids.
+	 */
+	public function getDisplayNames($search = '', $limit = null, $offset = null) {
+		$displayNames = array();
+		$users = $this->getUsers($search, $limit, $offset);
+		foreach ( $users as $user) {
+			$displayNames[$user] = $user;
+		}
+		return $displayNames;
+	}
 }
diff --git a/lib/user/database.php b/lib/user/database.php
index f33e338e2e4919a0cf8c84d514f6e84e800f82b3..7deeb0c4697b1320cbd599a240e1c92be0a8920e 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -110,7 +110,61 @@ class OC_User_Database extends OC_User_Backend {
 			return false;
 		}
 	}
+	
+	/**
+	 * @brief Set display name
+	 * @param $uid The username
+	 * @param $displayName The new display name
+	 * @returns true/false
+	 *
+	 * Change the display name of a user
+	 */
+	public function setDisplayName( $uid, $displayName ) {
+		if( $this->userExists($uid) ) {
+			$query = OC_DB::prepare( 'UPDATE `*PREFIX*users` SET `displayname` = ? WHERE `uid` = ?' );
+			$query->execute( array( $displayName, $uid ));
+			return true;
+		}else{
+			return false;
+		}
+	}
 
+	/**
+	 * @brief get display name of the user
+	 * @param $uid user ID of the user
+	 * @return display name
+	 */
+	public function getDisplayName($uid) {
+		if( $this->userExists($uid) ) {
+			$query = OC_DB::prepare( 'SELECT displayname FROM `*PREFIX*users` WHERE `uid` = ?' );
+			$result = $query->execute( array( $uid ))->fetchAll();
+			$displayName = trim($result[0]['displayname'], ' ');
+			if ( !empty($displayName) ) {
+				return $displayName;
+			} else {
+				return $uid;
+			}
+		}
+	}
+	
+	/**
+	 * @brief Get a list of all display names
+	 * @returns array with  all displayNames (value) and the correspondig uids (key)
+	 *
+	 * Get a list of all display names and user ids.
+	 */
+	public function getDisplayNames($search = '', $limit = null, $offset = null) {
+		$displayNames = array();
+		$query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`displayname`) LIKE LOWER(?)', $limit, $offset);
+		$result = $query->execute(array($search.'%'));
+		$users = array();
+		while ($row = $result->fetchRow()) {
+			$displayName =  trim($row['displayname'], ' ');
+			$displayNames[$row['uid']] = empty($displayName) ? $row['uid'] : $displayName;
+		}
+		return $displayNames;
+	}
+	
 	/**
 	 * @brief Check if the password is correct
 	 * @param $uid The username
diff --git a/lib/user/interface.php b/lib/user/interface.php
index 3d9f4691f2414122b0a7801726a3a0ed03c7ba7b..b4667633b5083b13996f678988b9938951f5a9f7 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -57,4 +57,19 @@ interface OC_User_Interface {
 	*/
 	public function userExists($uid);
 
+	/**
+	 * @brief get display name of the user
+	 * @param $uid user ID of the user
+	 * @return display name
+	 */
+	public function getDisplayName($uid);
+
+	/**
+	 * @brief Get a list of all display names
+	 * @returns array with  all displayNames (value) and the correspondig uids (key)
+	 *
+	 * Get a list of all display names and user ids.
+	 */
+	public function getDisplayNames($search = '', $limit = null, $offset = null);
+
 }
\ No newline at end of file
diff --git a/lib/util.php b/lib/util.php
index 7b1de094eade60887a44d44438c2a4a7dd2cc70b..0543df979d33949859bc34d08e6ff03a95200c06 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -95,7 +95,7 @@ class OC_Util {
 	 */
 	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, 91, 02);
+		return array(4, 91, 03);
 	}
 
 	/**
@@ -342,10 +342,7 @@ class OC_Util {
 	 * Check if the user is a admin, redirects to home if not
 	 */
 	public static function checkAdminUser() {
-		// Check if we are a user
-		self::checkLoggedIn();
-		self::verifyUser();
-		if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
+		if( !OC_User::isAdminUser(OC_User::getUser())) {
 			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
 		}
@@ -356,12 +353,6 @@ class OC_Util {
 	 * @return array $groups where the current user is subadmin
 	 */
 	public static function checkSubAdminUser() {
-		// Check if we are a user
-		self::checkLoggedIn();
-		self::verifyUser();
-		if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
-			return true;
-		}
 		if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
 			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
@@ -369,40 +360,6 @@ class OC_Util {
 		return true;
 	}
 
-	/**
-	 * Check if the user verified the login with his password in the last 15 minutes
-	 * If not, the user will be shown a password verification page
-	 */
-	public static function verifyUser() {
-		if(OC_Config::getValue('enhancedauth', false) === true) {
-			// Check password to set session
-			if(isset($_POST['password'])) {
-				if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) {
-					$_SESSION['verifiedLogin']=time() + OC_Config::getValue('enhancedauthtime', 15 * 60);
-				}
-			}
-
-			// Check if the user verified his password
-			if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
-				OC_Template::printGuestPage("", "verify",  array('username' => OC_User::getUser()));
-				exit();
-			}
-		}
-	}
-
-	/**
-	 * Check if the user verified the login with his password
-	 * @return bool
-	 */
-	public static function isUserVerified() {
-		if(OC_Config::getValue('enhancedauth', false) === true) {
-			if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
-				return false;
-			}
-		}
-		return true;
-	}
-
 	/**
 	 * Redirect to the user default page
 	 */
@@ -510,8 +467,11 @@ 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)) array_walk_recursive($value, 'OC_Util::sanitizeHTML');
-		else $value = htmlentities($value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+		if (is_array($value) || is_object($value)) {
+			array_walk_recursive($value, 'OC_Util::sanitizeHTML');
+		} else {
+			$value = htmlentities($value, ENT_QUOTES, 'UTF-8'); //Specify encoding for PHP<5.4
+		}
 		return $value;
 	}
 
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 406a4eb1074cd4b1ccf0c8a9eb5dac05748621ad..1700870f91f31e0db8c8987997044fb8d440017a 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -763,4 +763,3 @@ class OC_VCategories {
 		return array_search(strtolower($needle), array_map('strtolower', $haystack));
 	}
 }
-
diff --git a/ocs/routes.php b/ocs/routes.php
index d77b96fc1452372e889f75cb046a27eaa5dda337..d6ee589df6ffe593f73dbd5b8c319d546334b14a 100644
--- a/ocs/routes.php
+++ b/ocs/routes.php
@@ -17,4 +17,4 @@ OC_API::register('get', '/privatedata/getattribute/{app}', array('OC_OCS_Private
 OC_API::register('get', '/privatedata/getattribute/{app}/{key}', array('OC_OCS_Privatedata', 'get'), 'ocs', OC_API::USER_AUTH);
 OC_API::register('post', '/privatedata/setattribute/{app}/{key}', array('OC_OCS_Privatedata', 'set'), 'ocs', OC_API::USER_AUTH);
 OC_API::register('post', '/privatedata/deleteattribute/{app}/{key}', array('OC_OCS_Privatedata', 'delete'), 'ocs', OC_API::USER_AUTH);
-?>
+
diff --git a/robots.txt b/robots.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1f53798bb4fe33c86020be7f10c44f29486fd190
--- /dev/null
+++ b/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
diff --git a/settings/ajax/changedisplayname.php b/settings/ajax/changedisplayname.php
new file mode 100644
index 0000000000000000000000000000000000000000..f80ecb7a0c939063cc44d2125f40058a51f41f87
--- /dev/null
+++ b/settings/ajax/changedisplayname.php
@@ -0,0 +1,28 @@
+<?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(is_null($userstatus)) {
+	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));
+	exit();
+}
+
+// Return Success story
+if( OC_User::setDisplayName( $username, $displayName )) {
+	OC_JSON::success(array("data" => array( "username" => $username )));
+}
+else{
+	OC_JSON::error(array("data" => array( "message" => "Unable to change display name" )));
+}
\ No newline at end of file
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index b2db2611518182df78ef760b1350561ff5e9530b..8d45e62e4d8e6dcfafe5db3ba1392dc42bbef62d 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -9,7 +9,7 @@ $password = $_POST["password"];
 $oldPassword=isset($_POST["oldpassword"])?$_POST["oldpassword"]:'';
 
 $userstatus = null;
-if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+if(OC_User::isAdminUser(OC_User::getUser())) {
 	$userstatus = 'admin';
 }
 if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
@@ -30,10 +30,6 @@ if(is_null($userstatus)) {
 	exit();
 }
 
-if($userstatus === 'admin' || $userstatus === 'subadmin') {
-	OC_JSON::verifyUser();
-}
-
 // Return Success story
 if( OC_User::setPassword( $username, $password )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index addae78517a45c51de930517355eb8a41ba42d23..09ef25d92fa1f6835e5dc0617daca43bf5bf06c4 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -3,9 +3,7 @@
 OCP\JSON::callCheck();
 OC_JSON::checkSubAdminUser();
 
-$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
-
-if($isadmin) {
+if(OC_User::isAdminUser(OC_User::getUser())) {
 	$groups = array();
 	if( isset( $_POST["groups"] )) {
 		$groups = $_POST["groups"];
diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 9ffb32a0b23fa5704cf69dba540c134e93f65960..bf3a34f1472ffae747cc165f24af756af3a0a2e9 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -10,7 +10,7 @@ if(OC_User::getUser() === $username) {
 	exit;
 }
 
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
+if(!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/setquota.php b/settings/ajax/setquota.php
index 845f8ea408c82da7d328cfcee6b1e2fdcae9096b..356466c0c002c3d509a5aef5cf3e8ff307143a8a 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !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 83d455550aee38c23e419ca7feec907e0aa35acb..9bba9c5269d0f8d56e24a3252e5a2432fd695e74 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,13 +7,13 @@ $success = true;
 $username = $_POST["username"];
 $group = $_POST["group"];
 
-if($username == OC_User::getUser() && $group == "admin" &&  OC_Group::inGroup($username, 'admin')) {
+if($username == OC_User::getUser() && $group == "admin" &&  OC_User::isAdminUser($username)) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
 	exit();
 }
 
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && (!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();
@@ -31,8 +31,8 @@ $action = "add";
 // Toggle group
 if( OC_Group::inGroup( $username, $group )) {
 	$action = "remove";
-    $error = $l->t("Unable to remove user from group %s", $group);
-    $success = OC_Group::removeFromGroup( $username, $group );
+	$error = $l->t("Unable to remove user from group %s", $group);
+	$success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
 	if(count($usersInGroup)==0) {
 		OC_Group::deleteGroup($group);
diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index eaeade60a39014ef423362e117e496942ba7de91..9bbff80ea0cc17eef7bccd0ae2e13f699b093fea 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -28,7 +28,7 @@ if (isset($_GET['offset'])) {
 	$offset = 0;
 }
 $users = array();
-if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
+if (OC_User::isAdminUser(OC_User::getUser())) {
 	$batch = OC_User::getUsers('', 10, $offset);
 	foreach ($batch as $user) {
 		$users[] = array(
diff --git a/settings/apps.php b/settings/apps.php
index e28c8d5a3597eaf2a98cc238818bf261195ce105..4f8eba159c2270189dcad22b09232c281c61ee3d 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -26,116 +26,21 @@ OC_App::loadApps();
 
 // Load the files we need
 OC_Util::addStyle( "settings", "settings" );
-OC_Util::addScript( "settings", "apps" );
 OC_App::setActiveNavigationEntry( "core_apps" );
 
-$installedApps = OC_App::getAllApps();
-
-//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature?
-
-$blacklist = array('files');//we dont want to show configuration for these
-
-$appList = array();
-
-foreach ( $installedApps as $app ) {
-
-	if ( array_search( $app, $blacklist ) === false ) {
-	
-		$info=OC_App::getAppInfo($app);
-		
-		if (!isset($info['name'])) {
-		
-			OC_Log::write('core', 'App id "'.$app.'" has no name in appinfo', OC_Log::ERROR);
-			
-			continue;
-			
-		}
-		
-		if ( OC_Appconfig::getValue( $app, 'enabled', 'no') == 'yes' ) {
-		
-			$active = true;
-			
-		} else {
-		
-			$active = false;
-			
-		}
-		
-		$info['active'] = $active;
-		
-		if(isset($info['shipped']) and ($info['shipped']=='true')) {
-		
-			$info['internal']=true;
-			
-			$info['internallabel']='Internal App';
-			$info['internalclass']='';
-
-			$info['update']=false;
-		
-		}else{
-		
-			$info['internal']=false;
-			
-			$info['internallabel']='3rd Party App';
-			$info['internalclass']='externalapp';
-
-			$info['update']=OC_Installer::isUpdateAvailable($app);
-		}
-		
-		$info['preview'] = OC_Helper::imagePath('settings', 'trans.png');
-		
-		$info['version'] = OC_App::getAppVersion($app);
-		
-		$appList[] = $info;
-		
-	}
-}
-
-$remoteApps = OC_App::getAppstoreApps();
-
-if ( $remoteApps ) {
-
-	// Remove duplicates
-	foreach ( $appList as $app ) {
-
-		foreach ( $remoteApps AS $key => $remote ) {
-		
-			if (
-			$app['name'] == $remote['name']
-			// To set duplicate detection to use OCS ID instead of string name,
-			// enable this code, remove the line of code above,
-			// and add <ocs_id>[ID]</ocs_id> to info.xml of each 3rd party app:
-			// OR $app['ocs_id'] == $remote['ocs_id']
-			) {
-				
-				unset( $remoteApps[$key]);
-			
-			}
-		
-		}
-		
-	}
-
-	$combinedApps = array_merge( $appList, $remoteApps );
-
-} else {
-
-	$combinedApps = $appList;
-	
-}
-
 function app_sort( $a, $b ) {
 
 	if ($a['active'] != $b['active']) {
-	
+
 		return $b['active'] - $a['active'];
-		
+
 	}
-	
+
 	return strcmp($a['name'], $b['name']);
-	
+
 }
 
+$combinedApps = OC_App::listAllApps();
 usort( $combinedApps, 'app_sort' );
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
@@ -147,3 +52,4 @@ $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
 $tmpl->assign('appid', $appid);
 
 $tmpl->printPage();
+
diff --git a/settings/help.php b/settings/help.php
index cd3d615425ca1b651a153c207f1936b2cf603d08..a5ac11ec9a3e0e41d5662a90e4a0b32a5ff27ea4 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -27,7 +27,7 @@ $url1=OC_Helper::linkToRoute( "settings_help" ).'?mode=user';
 $url2=OC_Helper::linkToRoute( "settings_help" ).'?mode=admin';
 
 $tmpl = new OC_Template( "settings", "help", "user" );
-$tmpl->assign( "admin", OC_Group::inGroup(OC_User::getUser(), 'admin') );
+$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));
 $tmpl->assign( "url", $url );
 $tmpl->assign( "url1", $url1 );
 $tmpl->assign( "url2", $url2 );
diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php
new file mode 100644
index 0000000000000000000000000000000000000000..9ec2a758ee3b5806bf28a016861507cabef9ca36
--- /dev/null
+++ b/settings/js/apps-custom.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Check if admin user
+OC_Util::checkAdminUser();
+
+// Set the content type to JSON
+header('Content-type: application/json');
+
+// Disallow caching
+header("Cache-Control: no-cache, must-revalidate"); 
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
+
+$combinedApps = OC_App::listAllApps();
+
+foreach($combinedApps as $app) {
+	echo("appData_".$app['id']."=".json_encode($app));
+	echo("\n");
+}
+
+echo ("var appid =\"".$_GET['appid']."\";");
\ No newline at end of file
diff --git a/settings/js/isadmin.php b/settings/js/isadmin.php
new file mode 100644
index 0000000000000000000000000000000000000000..8b31f8a7cf912bb235d6c079dcf8a315f537de66
--- /dev/null
+++ b/settings/js/isadmin.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// Set the content type to Javascript
+header("Content-type: text/javascript");
+
+// Disallow caching
+header("Cache-Control: no-cache, must-revalidate"); 
+header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
+
+if (OC_User::isAdminUser(OC_User::getUser())) {
+	echo("var isadmin = true;");
+} else {
+	echo("var isadmin = false;");
+}
\ No newline at end of file
diff --git a/settings/js/users.js b/settings/js/users.js
index fa6f058d923329170e9ba6abee76375a6045506f..424d00b51a7aa66f6c7da9952114783fd5eb708a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -26,9 +26,8 @@ var UserList = {
         UserList.deleteCanceled = false;
 
         // Provide user with option to undo
-        $('#notification').html(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
         $('#notification').data('deleteuser', true);
-        $('#notification').fadeIn();
+        OC.Notification.showHtml(t('users', 'deleted') + ' ' + uid + '<span class="undo">' + t('users', 'undo') + '</span>');
     },
 
     /**
@@ -53,7 +52,7 @@ var UserList = {
                 success:function (result) {
                     if (result.status == 'success') {
                         // Remove undo option, & remove user from table
-                        $('#notification').fadeOut();
+                        OC.Notification.hide();
                         $('tr').filterAttr('data-uid', UserList.deleteUid).remove();
                         UserList.deleteCanceled = true;
                         if (ready) {
@@ -70,7 +69,9 @@ var UserList = {
     add:function (username, groups, subadmin, quota, sort) {
         var tr = $('tbody tr').first().clone();
         tr.attr('data-uid', username);
+        tr.attr('data-displayName', username);
         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);
         tr.find('td.groups').empty();
         if (tr.find('td.subadmins').length > 0) {
@@ -197,7 +198,7 @@ var UserList = {
                 checked:checked,
                 oncheck:checkHandeler,
                 onuncheck:checkHandeler,
-                minWidth:100,
+                minWidth:100
             });
         }
         if ($(element).attr('class') == 'subadminsselect') {
@@ -232,7 +233,7 @@ var UserList = {
                 checked:checked,
                 oncheck:checkHandeler,
                 onuncheck:checkHandeler,
-                minWidth:100,
+                minWidth:100
             });
         }
     }
@@ -300,6 +301,40 @@ $(document).ready(function () {
     $('td.password').live('click', function (event) {
         $(this).children('img').click();
     });
+    
+    $('td.displayName>img').live('click', function (event) {
+        event.stopPropagation();
+        var img = $(this);
+        var uid = img.parent().parent().attr('data-uid');
+        var displayName = img.parent().parent().attr('data-displayName');
+        var input = $('<input type="text" value="'+displayName+'">');
+        img.css('display', 'none');
+        img.parent().children('span').replaceWith(input);
+        input.focus();
+        input.keypress(function (event) {
+            if (event.keyCode == 13) {
+                if ($(this).val().length > 0) {
+                    $.post(
+                        OC.filePath('settings', 'ajax', 'changedisplayname.php'),
+                        {username:uid, displayName:$(this).val()},
+                        function (result) {
+                        }
+                    );
+                    input.blur();
+                } else {
+                    input.blur();
+                }
+            }
+        });
+        input.blur(function () {
+            $(this).replaceWith($(this).val());
+            img.css('display', '');
+        });
+    });
+    $('td.displayName').live('click', function (event) {
+        $(this).children('img').click();
+    });
+    
 
     $('select.quota, select.quota-user').live('change', function () {
         var select = $(this);
@@ -389,7 +424,7 @@ $(document).ready(function () {
             {
                 username:username,
                 password:password,
-                groups:groups,
+                groups:groups
             },
             function (result) {
                 if (result.status != 'success') {
@@ -402,13 +437,13 @@ $(document).ready(function () {
         );
     });
     // Handle undo notifications
-    $('#notification').hide();
+    OC.Notification.hide();
     $('#notification .undo').live('click', function () {
         if ($('#notification').data('deleteuser')) {
             $('tbody tr').filterAttr('data-uid', UserList.deleteUid).show();
             UserList.deleteCanceled = true;
         }
-        $('#notification').fadeOut();
+        OC.Notification.hide();
     });
     UserList.useUndo = ('onbeforeunload' in window)
     $(window).bind('beforeunload', function () {
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 20d4cced2335b94c5e1b7fecabc68ff34e98e554..2870527781a1cc2707afff9ff5f3399b7dbcdb98 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Ø¥Ø³ØªØ®Ø¯Ù… Ù‡Ø°Ø§ Ø§Ù„Ø¹Ù†ÙˆØ§Ù† Ù„Ù„Ø¥ØªØµØ§Ù„ Ø¨Ù€ ownCloud ÙÙŠ Ù…Ø¯ÙŠØ± Ø§Ù„Ù…Ù„ÙØ§Øª",
 "Version" => "Ø¥ØµØ¯Ø§Ø±",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ø·ÙˆÙ‘Ø± Ù…Ù† Ù‚Ø¨Ù„ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Ù…Ø¬ØªÙ…Ø¹</a>, Ø§Ù„Ù€ <a href=\"https://github.com/owncloud\" target=\"_blank\">Ø§Ù„Ù†Øµ Ø§Ù„Ù…ØµØ¯Ø±ÙŠ</a> Ù…Ø±Ø®Øµ Ø¨Ù…ÙˆØ¬Ø¨ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">Ø±Ø®ØµØ© Ø£ÙÙŠØ±Ùˆ Ø§Ù„Ø¹Ù…ÙˆÙ…ÙŠØ©</abbr></a>.",
-"Name" => "Ø§Ù„Ø§Ø³Ù…",
 "Groups" => "Ù…Ø¬Ù…ÙˆØ¹Ø§Øª",
 "Create" => "Ø§Ù†Ø´Ø¦",
 "Other" => "Ø´ÙŠØ¡ Ø¢Ø®Ø±",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 853e12812ed8e25592dc0250cf71b45b77f2a670..bee057a998f8f58e743a67c7d1398cb3db0a7f54 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Authentication error" => "Ð’ÑŠÐ·Ð½Ð¸ÐºÐ½Ð° Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼ Ñ Ð¸Ð´ÐµÐ½Ñ‚Ð¸Ñ„Ð¸ÐºÐ°Ñ†Ð¸ÑÑ‚Ð°",
+"Invalid request" => "ÐÐµÐ²Ð°Ð»Ð¸Ð´Ð½Ð° Ð·Ð°ÑÐ²ÐºÐ°",
 "Enable" => "Ð’ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¾",
 "Password" => "ÐŸÐ°Ñ€Ð¾Ð»Ð°",
 "Email" => "E-mail",
-"Name" => "Ð˜Ð¼Ðµ",
 "Groups" => "Ð“Ñ€ÑƒÐ¿Ð¸",
 "Delete" => "Ð˜Ð·Ñ‚Ñ€Ð¸Ð²Ð°Ð½Ðµ"
 );
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index bab6d9ec19c77deba76c2428423f53484fc7300d..fc85e705750f54d4f9550f81c2c20681c9417753 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "à¦†à¦ªà¦¨à¦¾à¦° ownCloud à¦ à¦¸à¦‚à¦¯à§à¦•à§à¦¤ à¦¹à¦¤à§‡ à¦à¦‡ à¦ à¦¿à¦•à¦¾à¦¨à¦¾à¦Ÿà¦¿ à¦†à¦ªà¦¨à¦¾à¦° à¦«à¦¾à¦‡à¦² à¦¬à§à¦¯à¦¬à¦¸à§à¦¥à¦¾à¦ªà¦•à§‡ à¦¬à§à¦¯à¦¬à¦¹à¦¾à¦° à¦•à¦°à§à¦¨",
 "Version" => "à¦à¦¾à¦°à§à¦¸à¦¨",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "à¦¤à§ˆà¦²à§€ à¦•à¦°à§‡à¦›à§‡à¦¨ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud à¦¸à¦®à§à¦ªà§à¦°à¦¦à¦¾à§Ÿ</a>, à¦¯à¦¾à¦° <a href=\"https://github.com/owncloud\" target=\"_blank\"> à¦‰à§Žà¦¸ à¦•à§‹à¦¡à¦Ÿà¦¿ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> à¦à¦° à¦…à¦§à§€à¦¨à§‡ à¦²à¦¾à¦‡à¦¸à§‡à¦¨à§à¦¸à¦•à§ƒà¦¤à¥¤",
-"Name" => "à¦°à¦¾à¦®",
 "Groups" => "à¦—à§‹à¦·à§à¦ à§€à¦¸à¦®à§‚à¦¹",
 "Create" => "à¦¤à§ˆà¦°à§€ à¦•à¦°",
 "Default Storage" => "à¦ªà§‚à¦°à§à¦¬à¦¨à¦¿à¦°à§à¦§à¦¾à¦°à¦¿à¦¤ à¦¸à¦‚à¦°à¦•à§à¦·à¦£à¦¾à¦—à¦¾à¦°",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 35952475254799f299e526a8090e19ac9110a6ca..1f23c2cfd66fcba0f987c615cf04909babefac74 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Useu aquesta adreÃ§a per connectar amb ownCloud des del gestor de fitxers",
 "Version" => "VersiÃ³",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> tÃ© llicÃ¨ncia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nom",
 "Groups" => "Grups",
 "Create" => "Crea",
 "Default Storage" => "Emmagatzemament per defecte",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index d20861764a99eaf8e3fd6685480e4de2f632290f..be75a679c65cfc45a7d257399910169bbd97cb74 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "PouÅ¾ijte tuto adresu pro pÅ™ipojenÃ k vaÅ¡emu ownCloud skrze sprÃ¡vce souborÅ¯",
 "Version" => "Verze",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojovÃ½ kÃ³d</a> je licencovÃ¡n pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "JmÃ©no",
 "Groups" => "Skupiny",
 "Create" => "VytvoÅ™it",
 "Default Storage" => "VÃ½chozÃ ÃºloÅ¾iÅ¡tÄ›",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 021d7f814bbd1fd3804bfc7e5e01c989a8f52f21..f0842922d62668924a794c2a67e366f27198da7f 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Brug denne adresse til at oprette forbindelse til din ownCloud i din filstyring",
 "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>.",
-"Name" => "Navn",
 "Groups" => "Grupper",
 "Create" => "Ny",
 "Default Storage" => "Standard opbevaring",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 3bb53f99b2e6fa1adec64951b4f906868c36bf9c..d2a9a826aaf7069883ffcce1d02a54cb39fcd0b6 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -29,7 +29,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>",
-"Clients" => "Kunden",
+"Clients" => "Clients",
 "Download Desktop Clients" => "Desktop-Client herunterladen",
 "Download Android Client" => "Android-Client herunterladen",
 "Download iOS Client" => "iOS-Client herunterladen",
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Verwende diese Adresse, um Deinen Dateimanager mit Deiner ownCloud zu verbinden",
 "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.",
-"Name" => "Name",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
 "Default Storage" => "Standard-Speicher",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index dd129fc59eba187b9b6d25d27afea697e27c956a..cb735adfdf976e9a28ebaef2d00bd32f2f6ed305 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -29,7 +29,7 @@
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommerzieller Support",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Sie verwenden <strong>%s</strong> der verfÃ¼gbaren <strong>%s</strong>",
-"Clients" => "Kunden",
+"Clients" => "Clients",
 "Download Desktop Clients" => "Desktop-Client herunterladen",
 "Download Android Client" => "Android-Client herunterladen",
 "Download iOS Client" => "iOS-Client herunterladen",
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Verwenden Sie diese Adresse, um Ihren Dateimanager mit Ihrer ownCloud zu verbinden",
 "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.",
-"Name" => "Name",
 "Groups" => "Gruppen",
 "Create" => "Anlegen",
 "Default Storage" => "Standard-Speicher",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 298633890483f1813dd79a8749fba547b31680b1..beacb5e61472261d7b1d8aaf5d0123a8d60c0dc9 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -49,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "Î§ÏÎ®ÏƒÎ· Î±Ï…Ï„Î®Ï‚ Ï„Î·Ï‚ Î´Î¹ÎµÏÎ¸Ï…Î½ÏƒÎ·Ï‚ Î³Î¹Î± ÏƒÏÎ½Î´ÎµÏƒÎ· ÏƒÏ„Î¿ ownCloud Î¼Îµ Ï„Î¿Î½ Î´Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„Î® Î±ÏÏ‡ÎµÎ¯Ï‰Î½ ÏƒÎ±Ï‚",
 "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>.",
-"Name" => "ÎŒÎ½Î¿Î¼Î±",
 "Groups" => "ÎŸÎ¼Î¬Î´ÎµÏ‚",
 "Create" => "Î”Î·Î¼Î¹Î¿Ï…ÏÎ³Î¯Î±",
+"Default Storage" => "Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î· Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ· ",
+"Unlimited" => "Î‘Ï€ÎµÏÎ¹ÏŒÏÎ¹ÏƒÏ„Î¿",
 "Other" => "Î†Î»Î»Î±",
 "Group Admin" => "ÎŸÎ¼Î¬Î´Î± Î”Î¹Î±Ï‡ÎµÎ¹ÏÎ¹ÏƒÏ„ÏŽÎ½",
+"Storage" => "Î‘Ï€Î¿Î¸Î®ÎºÎµÏ…ÏƒÎ·",
+"Default" => "Î ÏÎ¿ÎºÎ±Î¸Î¿ÏÎ¹ÏƒÎ¼ÎÎ½Î¿",
 "Delete" => "Î”Î¹Î±Î³ÏÎ±Ï†Î®"
 );
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 651403be68cf3a85713e99cb9f3e7ebc48bf9e4d..e17380441cf7d103c8facfbba393447f4cdbf57a 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -22,8 +22,17 @@
 "Select an App" => "Elekti aplikaÄµon",
 "See application page at apps.owncloud.com" => "Vidu la paÄon pri aplikaÄµoj Ä‰e apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
+"User Documentation" => "Dokumentaro por uzantoj",
+"Administrator Documentation" => "Dokumentaro por administrantoj",
+"Online Documentation" => "Reta dokumentaro",
+"Forum" => "Forumo",
+"Bugtracker" => "Cimoraportejo",
+"Commercial Support" => "Komerca subteno",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
 "Clients" => "Klientoj",
+"Download Desktop Clients" => "ElÅuti labortablajn klientojn",
+"Download Android Client" => "ElÅuti Android-klienton",
+"Download iOS Client" => "ElÅuti iOS-klienton",
 "Password" => "Pasvorto",
 "Your password was changed" => "Via pasvorto ÅanÄiÄis",
 "Unable to change your password" => "Ne eblis ÅanÄi vian pasvorton",
@@ -36,11 +45,17 @@
 "Fill in an email address to enable password recovery" => "Enigu retpoÅtadreson por kapabligi pasvortan restaÅron",
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "Uzu Ä‰i tiun adreson por konekti al via ownCloud vian dosieradministrilon",
+"Version" => "Eldono",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laÅ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nomo",
 "Groups" => "Grupoj",
 "Create" => "Krei",
+"Default Storage" => "DefaÅlta konservejo",
+"Unlimited" => "Senlima",
 "Other" => "Alia",
 "Group Admin" => "Grupadministranto",
+"Storage" => "Konservejo",
+"Default" => "DefaÅlta",
 "Delete" => "Forigi"
 );
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 5434da7f981b2fdf122bc4861274c977d1305e60..2bc2a12a5a9582b01dc02bc19dba2cee39be3c9b 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Use esta direcciÃ³n para conectarse a su cuenta de ownCloud en el administrador de archivos",
 "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>.",
-"Name" => "Nombre",
 "Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamiento Predeterminado",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index a652ee1310326dbe9ba4e4c26b471c146e02ccc7..bbf45bc5620767dbea031a0983c5d6246eb07ddc 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Utiliza esta direcciÃ³n para conectarte con ownCloud en tu Administrador de Archivos",
 "Version" => "VersiÃ³n",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">cÃ³digo fuente</a> estÃ¡ bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nombre",
 "Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamiento Predeterminado",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 53f617172821958b9a85afbe03f6e25ab97b1776..751c88ecb592c975209efe13eba2ae71b9fa7975 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -34,7 +34,6 @@
 "Fill in an email address to enable password recovery" => "Parooli taastamise sisse lÃ¼litamiseks sisesta e-posti aadress",
 "Language" => "Keel",
 "Help translate" => "Aita tÃµlkida",
-"Name" => "Nimi",
 "Groups" => "Grupid",
 "Create" => "Lisa",
 "Other" => "Muu",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 78e3cc6248845fcea4801ab9fff4384d1876dab8..29e3a810ca420fa254d278b9b6b2ccd8320f30a5 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -49,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "Erabili helbide hau zure fitxategi kudeatzailean zure ownCloudera konektatzeko",
 "Version" => "Bertsioa",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
-"Name" => "Izena",
 "Groups" => "Taldeak",
 "Create" => "Sortu",
+"Default Storage" => "Lehenetsitako Biltegiratzea",
+"Unlimited" => "Mugarik gabe",
 "Other" => "Besteak",
 "Group Admin" => "Talde administradorea",
+"Storage" => "Biltegiratzea",
+"Default" => "Lehenetsia",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 44872e28f059dac1a4a1338f7e6a9807b5180577..59865c697cbe7da4a4e5975f2f1e5341f26e80d5 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -25,7 +25,6 @@
 "Fill in an email address to enable password recovery" => "Ù¾Ø³Øª Ø§Ù„Ú©ØªØ±ÙˆÙ†ÛŒÚ©ÛŒ Ø±Ø§ Ù¾Ø±Ú©Ù†ÛŒØ¯  ØªØ§ Ø¨Ø§Ø²ÛŒØ§Ø¨ÛŒ Ú¯Ø°Ø±ÙˆØ§Ú˜Ù‡ ÙØ¹Ø§Ù„ Ø´ÙˆØ¯",
 "Language" => "Ø²Ø¨Ø§Ù†",
 "Help translate" => "Ø¨Ù‡ ØªØ±Ø¬Ù…Ù‡ Ø¢Ù† Ú©Ù…Ú© Ú©Ù†ÛŒØ¯",
-"Name" => "Ù†Ø§Ù…",
 "Groups" => "Ú¯Ø±ÙˆÙ‡ Ù‡Ø§",
 "Create" => "Ø§ÛŒØ¬Ø§Ø¯ Ú©Ø±Ø¯Ù†",
 "Other" => "Ø³Ø§ÛŒØ±",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index dbab88b97a041342a76527ad45ec7662f029b48b..84b18902b996211561c62bf500be1fb22254b69e 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "KÃ¤ytÃ¤ tÃ¤tÃ¤ osoitetta yhdistÃ¤essÃ¤si ownCloudiisi tiedostonhallintaa kÃ¤yttÃ¤en",
 "Version" => "Versio",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "KehityksestÃ¤ on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisÃ¶</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lÃ¤hdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
-"Name" => "Nimi",
 "Groups" => "RyhmÃ¤t",
 "Create" => "Luo",
 "Unlimited" => "Rajoittamaton",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 03a61c69cf8ea061d048e59ee08fb27938067c16..5b9495b566d2920f0195d4b3f302f5082209e230 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Utiliser cette adresse pour vous connecter Ã  ownCloud dans votre gestionnaire de fichiers",
 "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>.",
-"Name" => "Nom",
 "Groups" => "Groupes",
 "Create" => "CrÃ©er",
 "Default Storage" => "Support de stockage par dÃ©faut",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index ddd5661fe720436141d0353bf992accdc8d07bd1..d3359f195131022968786a9f68791145e9335478 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Utilice este enderezo para conectarse ao seu ownCloud co administrador de ficheiros",
 "Version" => "VersiÃ³n",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">cÃ³digo fonte</a> estÃ¡ baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nome",
 "Groups" => "Grupos",
 "Create" => "Crear",
 "Default Storage" => "Almacenamento predeterminado",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index bbfe437ba30db0ed82a9ed2efcf8e4a514206d0a..b7e76fbaeda1d96e098e708df0ff448b96e4bee6 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -47,7 +47,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "×”×©×ª×ž×© ×‘×›×ª×•×‘×ª ×–××ª ×¢×œ ×ž× ×ª ×œ×”×ª×—×‘×¨ ××œ ownCloud ×“×¨×š ×¡×™×™×¨ ×§×‘×¦×™×.",
 "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>.",
-"Name" => "×©×",
 "Groups" => "×§×‘×•×¦×•×ª",
 "Create" => "×™×¦×™×¨×”",
 "Other" => "××—×¨",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 14053cb98a4f0ce1946ecb1f1f0ee3bcff0e2e67..010303eb44f167159a7f062bedf5cfdfa4d10804 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -24,7 +24,6 @@
 "Fill in an email address to enable password recovery" => "Ispunite vase e-mail adresa kako bi se omoguÄ‡ilo oporavak lozinke",
 "Language" => "Jezik",
 "Help translate" => "PomoÄ‡ prevesti",
-"Name" => "Ime",
 "Groups" => "Grupe",
 "Create" => "Izradi",
 "Other" => "ostali",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 35c59bdb2d6ac7b7121f6f41b606b74b57fec7b4..2e0960993606f31125e6bad407eb69944a27b0a6 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Ennek a cÃmnek a megadÃ¡sÃ¡val a WebDAV-protokollon keresztÃ¼l sajÃ¡t gÃ©pÃ©nek fÃ¡jlkezelÅ‘jÃ©vel is is elÃ©rheti az Ã¡llomÃ¡nyait.",
 "Version" => "VerziÃ³",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kÃ¶zÃ¶ssÃ©g</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forrÃ¡skÃ³d</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltÃ©telei mellett hasznÃ¡lhatÃ³ fÃ¶l.",
-"Name" => "NÃ©v",
 "Groups" => "Csoportok",
 "Create" => "LÃ©trehozÃ¡s",
 "Default Storage" => "AlapÃ©rtelmezett tÃ¡rhely",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 184287090989cf5b68fe0bd4fc1a5fb1f29907e3..121a1175e79e4e9614669b4b14769ed01dcdb5b4 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -15,7 +15,6 @@
 "Your email address" => "Tu adresse de e-posta",
 "Language" => "Linguage",
 "Help translate" => "Adjuta a traducer",
-"Name" => "Nomine",
 "Groups" => "Gruppos",
 "Create" => "Crear",
 "Other" => "Altere",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 132920a7a042f4c3c7c18d49d5d0f81e4463e994..0f04563fa3e7ec535b91ea6e7d4a069ef8ab38f4 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -23,7 +23,6 @@
 "Fill in an email address to enable password recovery" => "Masukkan alamat email untuk mengaktifkan pemulihan password",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
-"Name" => "Nama",
 "Groups" => "Group",
 "Create" => "Buat",
 "Other" => "Lain-lain",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index d978957ab48622bb89bc425dafa02f3a655c4cbc..5873057534398602ad3941e89a0ee1e3c0b9c97a 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "NotaÃ°u Ã¾essa vefslÃ³Ã° til aÃ° tengjast ownCloud svÃ¦Ã°inu Ã¾Ãnu",
 "Version" => "ÃštgÃ¡fa",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "ÃžrÃ³aÃ° af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfÃ©laginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kÃ³Ã°inn</a> er skrÃ¡Ã°u meÃ° <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nafn",
 "Groups" => "HÃ³par",
 "Create" => "BÃºa til",
 "Default Storage" => "SjÃ¡lfgefin gagnageymsla",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index d485f7ccd13a8a6de4026b0bbe2382afb01d673b..2199f7d8db8e99fb180f148696b3834bb23da7b9 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -49,13 +49,12 @@
 "Use this address to connect to your ownCloud in your file manager" => "Usa questo indirizzo per connetterti al tuo ownCloud dal tuo gestore file",
 "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>.",
-"Name" => "Nome",
 "Groups" => "Gruppi",
 "Create" => "Crea",
 "Default Storage" => "Archiviazione predefinita",
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
-"Group Admin" => "Gruppo di amministrazione",
+"Group Admin" => "Gruppi amministrati",
 "Storage" => "Archiviazione",
 "Default" => "Predefinito",
 "Delete" => "Elimina"
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index a660d21c780884740667b84721ef7a6a305756fe..dbf8d7d13e836ff7aa63f79e203ccee17316b668 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "ãƒ•ã‚¡ã‚¤ãƒ«ãƒžãƒãƒ¼ã‚¸ãƒ£ã§ownCloudã«æŽ¥ç¶šã™ã‚‹éš›ã¯ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’åˆ©ç”¨ã—ã¦ãã ã•ã„",
 "Version" => "ãƒãƒ¼ã‚¸ãƒ§ãƒ³",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>ã«ã‚ˆã‚Šé–‹ç™ºã•ã‚Œã¦ã„ã¾ã™ã€<a href=\"https://github.com/owncloud\" target=\"_blank\">ã‚½ãƒ¼ã‚¹ã‚³ãƒ¼ãƒ‰</a>ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã¯ã€<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ãƒ©ã‚¤ã‚»ãƒ³ã‚¹ã«ã‚ˆã‚Šæä¾›ã•ã‚Œã¦ã„ã¾ã™ã€‚",
-"Name" => "åå‰",
 "Groups" => "ã‚°ãƒ«ãƒ¼ãƒ—",
 "Create" => "ä½œæˆ",
 "Default Storage" => "ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 68dbc736dcd80e2b23985e7591f28d6ca5144070..2bc2e7d5de72d30cd9d8b346fe933cae0eb6a013 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -34,7 +34,6 @@
 "Fill in an email address to enable password recovery" => "áƒ¨áƒ”áƒáƒ•áƒ¡áƒ”áƒ— áƒ˜áƒ›áƒ”áƒ˜áƒš áƒ›áƒ˜áƒ¡áƒáƒ›áƒáƒ áƒ—áƒ˜áƒ¡ áƒ•áƒ”áƒšáƒ˜ áƒžáƒáƒ áƒáƒšáƒ˜áƒ¡ áƒáƒ¦áƒ¡áƒáƒ“áƒ’áƒ”áƒœáƒáƒ“",
 "Language" => "áƒ”áƒœáƒ",
 "Help translate" => "áƒ—áƒáƒ áƒ’áƒ›áƒœáƒ˜áƒ¡ áƒ“áƒáƒ®áƒ›áƒáƒ áƒ”áƒ‘áƒ",
-"Name" => "áƒ¡áƒáƒ®áƒ”áƒšáƒ˜",
 "Groups" => "áƒ¯áƒ’áƒ£áƒ¤áƒ˜",
 "Create" => "áƒ¨áƒ”áƒ¥áƒ›áƒœáƒ",
 "Other" => "áƒ¡áƒ®áƒ•áƒ",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 4a7817b8401406018b78f646fd0ca6bf78065a7e..3a794eb3ceb8fd870ca3c24de658aab806aae871 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "íŒŒì¼ ë§¤ë‹ˆì €ì—ì„œ ì‚¬ìš©ìžì˜ ownCloudì— ì ‘ì†í•˜ê¸° ìœ„í•´ ì´ ì£¼ì†Œë¥¼ ì‚¬ìš©í•˜ì‹ì‹œìš”.",
 "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>ì— ë”°ë¼ ì‚¬ìš©ì´ í—ˆê°€ë©ë‹ˆë‹¤.",
-"Name" => "ì´ë¦„",
 "Groups" => "ê·¸ë£¹",
 "Create" => "ë§Œë“¤ê¸°",
 "Default Storage" => "ê¸°ë³¸ ì €ìž¥ì†Œ",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 6a4996e82529adf7354b1e4849f991523d87d5d2..ef9e806e59501bd97f544a7f2e68c7be2c9c03d8 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -3,6 +3,5 @@
 "Saving..." => "Ù¾Ø§Ø´Ú©Ù‡â€ŒÙˆØªØ¯Ù‡â€ŒÚ©Ø§Øª...",
 "Password" => "ÙˆØ´Û•ÛŒ ØªÛŽÙ¾Û•Ø±Ø¨Ùˆ",
 "New password" => "ÙˆØ´Û•ÛŒ Ù†Ù‡ÛŽÙ†ÛŒ Ù†ÙˆÛŽ",
-"Email" => "Ø¦ÛŒÙ…Ù‡â€ŒÛŒÙ„",
-"Name" => "Ù†Ø§Ùˆ"
+"Email" => "Ø¦ÛŒÙ…Ù‡â€ŒÛŒÙ„"
 );
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 1f9ea35e8858c19247e4b102669529f9461bd134..04acf53de43512aef9b08dd32aa54634d51ed2b3 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -24,7 +24,6 @@
 "Fill in an email address to enable password recovery" => "GÃ«ff eng Email Adress an fir d'Passwuert recovery ze erlaben",
 "Language" => "Sprooch",
 "Help translate" => "HÃ«llef iwwersetzen",
-"Name" => "Numm",
 "Groups" => "Gruppen",
 "Create" => "Erstellen",
 "Other" => "Aner",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 73af4f3b27b14c17904ca071ce81d312b9625a94..e8c1577c7fbdd0e1783654f12f0c6f2470aa99d2 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -27,7 +27,6 @@
 "Fill in an email address to enable password recovery" => "PamirÅ¡to slaptaÅ¾odÅ¾io atkÅ«rimui Ä¯veskite savo el. paÅ¡to adresÄ…",
 "Language" => "Kalba",
 "Help translate" => "PadÄ—kite iÅ¡versti",
-"Name" => "Vardas",
 "Groups" => "GrupÄ—s",
 "Create" => "Sukurti",
 "Other" => "Kita",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index ba44fdbb3e298d9e451ffdb4ec9c42278c59a0e5..4cafe3ab71d3de36c3cc986cf5cf1dd9d183e900 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -22,6 +22,7 @@
 "See application page at apps.owncloud.com" => "Apskatie aplikÄciju lapu - apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencÄ“ts no <span class=\"author\"></span>",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "JÅ«s lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
+"Clients" => "Klienti",
 "Password" => "Parole",
 "Your password was changed" => "JÅ«ru parole tika nomainÄ«ta",
 "Unable to change your password" => "Nav iespÄ“jams nomainÄ«t jÅ«su paroli",
@@ -35,7 +36,6 @@
 "Language" => "Valoda",
 "Help translate" => "PalÄ«dzi tulkot",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "IzstrÄdÄjusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurÅ¡ ir licencÄ“ts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "VÄrds",
 "Groups" => "Grupas",
 "Create" => "Izveidot",
 "Other" => "Cits",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 52fafc564790ea186c32f967eb5a5de34746f1d5..b041d41923a9514a671f416e00cdc68184cb23c6 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -48,7 +48,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "ÐšÐ¾Ñ€Ð¸ÑÑ‚ÐµÑ‚Ðµ Ñ˜Ð° Ð¾Ð²Ð°Ð° Ð°Ð´Ñ€ÐµÑÐ° Ð´Ð° ",
 "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>.",
-"Name" => "Ð˜Ð¼Ðµ",
 "Groups" => "Ð“Ñ€ÑƒÐ¿Ð¸",
 "Create" => "Ð¡Ð¾Ð·Ð´Ð°Ñ˜",
 "Other" => "ÐžÑÑ‚Ð°Ð½Ð°Ñ‚Ð¾",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 87f45d3c9a071363d6fd1ace0b4d8134e48a48b9..e2537679a6998979a9e6c7ed5cc022d7b93bb3d2 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -23,7 +23,6 @@
 "Fill in an email address to enable password recovery" => "Isi alamat emel anda untuk membolehkan pemulihan kata laluan",
 "Language" => "Bahasa",
 "Help translate" => "Bantu terjemah",
-"Name" => "Nama",
 "Groups" => "Kumpulan",
 "Create" => "Buat",
 "Other" => "Lain",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 52cfc92040b909194a20adc70670c603a5b0e947..ecd1466e7eeb04d679fe46100314f52ff40f3463 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -42,7 +42,6 @@
 "Help translate" => "Bidra til oversettelsen",
 "WebDAV" => "WebDAV",
 "Version" => "Versjon",
-"Name" => "Navn",
 "Groups" => "Grupper",
 "Create" => "Opprett",
 "Other" => "Annet",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 2b6fdbd608207040d9f2a93d35a1b6449a29d194..af76f376683b986875be4502c2ae8383358004ac 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Gebruik dit adres om te verbinden met uw ownCloud in uw bestandsbeheer",
 "Version" => "Versie",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Naam",
 "Groups" => "Groepen",
 "Create" => "CreÃ«er",
 "Default Storage" => "Default opslag",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 923f5481d5ac730361eafb82f9acb932e8983562..778e7afc265700dc594ba9b7c14633bc5f40f9b9 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -21,7 +21,6 @@
 "Fill in an email address to enable password recovery" => "Fyll inn din e-post addresse for og kunne motta passord tilbakestilling",
 "Language" => "SprÃ¥k",
 "Help translate" => "Hjelp oss Ã¥ oversett",
-"Name" => "Namn",
 "Groups" => "Grupper",
 "Create" => "Lag",
 "Other" => "Anna",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 39445570fdbf81bf9864a6e7e6e798784dd86d25..e8ed2d5275866ef0c74458a76f2c1fcea759bb8b 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -33,7 +33,6 @@
 "Fill in an email address to enable password recovery" => "Emplena una adreiÃ§a de corriÃ¨l per permetre lo mandadÃs del senhal perdut",
 "Language" => "Lenga",
 "Help translate" => "Ajuda a la revirada",
-"Name" => "Nom",
 "Groups" => "Grops",
 "Create" => "Crea",
 "Other" => "Autres",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index c9e49f57a3e3aa0e8fd0d9c8129530fa638e2cd9..656636b258e345ca1030d93660ee9c9e18ba7fca 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -48,8 +48,7 @@
 "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",
 "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>." => "Stwirzone 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>.",
-"Name" => "Nazwa",
+"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>.",
 "Groups" => "Grupy",
 "Create" => "UtwÃ³rz",
 "Default Storage" => "DomyÅ›lny magazyn",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 3a1e6b863579c7405d873955e97b6ff2b36b1b1f..f14233d7e5800b3468f1cbd5f7f5c32f34a03d8b 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -16,7 +16,7 @@
 "Disable" => "Desabilitado",
 "Enable" => "Habilitado",
 "Saving..." => "Gravando...",
-"__language_name__" => "PortuguÃªs",
+"__language_name__" => "PortuguÃªs do Brasil",
 "Add your App" => "Adicione seu Aplicativo",
 "More Apps" => "Mais Apps",
 "Select an App" => "Selecione uma AplicaÃ§Ã£o",
@@ -37,7 +37,6 @@
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">cÃ³digo fonte</a> estÃ¡ licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nome",
 "Groups" => "Grupos",
 "Create" => "Criar",
 "Other" => "Outro",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 6bccb49d6497f1d99026a71b62aecb531e0a899b..af5dfbf6e47b16112a8d0bc7fae9e3eb08fc20a1 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Use este endereÃ§o no seu gestor de ficheiros para ligar Ã  sua ownCloud",
 "Version" => "VersÃ£o",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">cÃ³digo fonte</a> estÃ¡ licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nome",
 "Groups" => "Grupos",
 "Create" => "Criar",
 "Default Storage" => "Armazenamento PadrÃ£o",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index a96a7368499ccc8bdcf753fc897973223b57367a..17a091c569cc721d457828d99d09d3cfa91bb9b4 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -10,6 +10,7 @@
 "Unable to delete user" => "Nu s-a putut È™terge utilizatorul",
 "Language changed" => "Limba a fost schimbatÄƒ",
 "Invalid request" => "Cerere eronatÄƒ",
+"Admins can't remove themself from the admin group" => "Administratorii nu se pot È™terge singuri din grupul admin",
 "Unable to add user to group %s" => "Nu s-a putut adÄƒuga utilizatorul la grupul %s",
 "Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s",
 "Disable" => "DezactivaÈ›i",
@@ -27,6 +28,7 @@
 "Forum" => "Forum",
 "Bugtracker" => "UrmÄƒrire bug-uri",
 "Commercial Support" => "Suport comercial",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "AÈ›i utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
 "Clients" => "ClienÈ›i",
 "Download Desktop Clients" => "DescarcÄƒ client desktop",
 "Download Android Client" => "DescarcÄƒ client Android",
@@ -44,9 +46,9 @@
 "Language" => "Limba",
 "Help translate" => "AjutÄƒ la traducere",
 "WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "FoloseÈ™te aceastÄƒ adresÄƒ pentru a conecta ownCloud cu managerul de fiÈ™iere",
 "Version" => "Versiunea",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursÄƒ</a> este licenÈ›iat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Nume",
 "Groups" => "Grupuri",
 "Create" => "CreazÄƒ",
 "Default Storage" => "Stocare implicitÄƒ",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 5c05f32636aaf7b091e255fe4088eb64621577f7..2194c886f1d264af7d4bdec5515e66dfd8b59623 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑÑ‚Ð¾Ñ‚ URL Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð³Ð¾ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€Ð° Ðº Ð’Ð°ÑˆÐµÐ¼Ñƒ Ñ…Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ñƒ",
 "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>.",
-"Name" => "Ð˜Ð¼Ñ",
 "Groups" => "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹",
 "Create" => "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ",
 "Default Storage" => "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ð¿Ð¾-ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ",
diff --git a/settings/l10n/ru_RU.php b/settings/l10n/ru_RU.php
index 26179eeb329ad5b2530b70c7d7e0a47ef9cf0d48..50c3b136c47e48924d389d9494a7804e99c7ce50 100644
--- a/settings/l10n/ru_RU.php
+++ b/settings/l10n/ru_RU.php
@@ -30,6 +30,7 @@
 "Commercial Support" => "ÐšÐ¾Ð¼Ð¼ÐµÑ€Ñ‡ÐµÑÐºÐ°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ°",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ð’Ñ‹ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð»Ð¸ <strong>%s</strong> Ð¸Ð· Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ñ‹Ñ… <strong>%s</strong>",
 "Clients" => "ÐšÐ»Ð¸ÐµÐ½Ñ‚Ñ‹",
+"Download Desktop Clients" => "Ð—Ð°Ð³Ñ€ÑƒÐ·ÐºÐ° Ð´ÐµÑÐºÑ‚Ð¾Ð¿Ð½Ñ‹Ñ… ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð²",
 "Download Android Client" => "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚ Ð¿Ð¾Ð´ Android ",
 "Download iOS Client" => "Ð—Ð°Ð³Ñ€ÑƒÐ·Ð¸Ñ‚ÑŒ ÐºÐ»Ð¸ÐµÐ½Ñ‚ Ð¿Ð¾Ð´ iOS ",
 "Password" => "ÐŸÐ°Ñ€Ð¾Ð»ÑŒ",
@@ -48,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "Ð˜ÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐ¹Ñ‚Ðµ ÑÑ‚Ð¾Ñ‚ Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ðº ownCloud Ð² Ð’Ð°ÑˆÐµÐ¼ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¼ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€Ðµ",
 "Version" => "Ð’ÐµÑ€ÑÐ¸Ñ",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ð Ð°Ð·Ñ€Ð°Ð±Ð¾Ñ‚Ð°Ð½Ð½Ñ‹Ð¹ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Ð˜Ð¼Ñ",
 "Groups" => "Ð“Ñ€ÑƒÐ¿Ð¿Ñ‹",
 "Create" => "Ð¡Ð¾Ð·Ð´Ð°Ñ‚ÑŒ",
+"Default Storage" => "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ",
+"Unlimited" => "ÐÐµÐ¾Ð³Ñ€Ð°Ð½Ð¸Ñ‡ÐµÐ½Ð½Ñ‹Ð¹",
 "Other" => "Ð”Ñ€ÑƒÐ³Ð¾Ð¹",
 "Group Admin" => "Ð“Ñ€ÑƒÐ¿Ð¿Ð° Admin",
+"Storage" => "Ð¥Ñ€Ð°Ð½Ð¸Ð»Ð¸Ñ‰Ðµ",
+"Default" => "ÐŸÐ¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ",
 "Delete" => "Ð£Ð´Ð°Ð»Ð¸Ñ‚ÑŒ"
 );
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 45cb9a4a4fb339bd5d7b10dca5cc252de1d24ae9..8d7bc7adf5adf3551d57670af6f5ffb04746fda2 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -31,7 +31,6 @@
 "Language" => "à¶·à·à·‚à·à·€",
 "Help translate" => "à¶´à¶»à·’à·€à¶»à·Šà¶®à¶± à·ƒà·„à¶º",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "à¶±à·’à¶´à¶¯à¶± à¶½à¶¯à·Šà¶¯à·š <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud à·ƒà¶¸à·à¶¢à¶ºà·™à¶±à·Š</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">à¶¸à·”à¶½à·Š à¶šà·šà¶à¶º </a>à¶½à¶ºà·’à·ƒà¶±à·Šà·ƒà·Š à¶šà¶» à¶‡à¶à·Šà¶à·š <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> à¶ºà¶§à¶à·š.",
-"Name" => "à¶±à·à¶¸à¶º",
 "Groups" => "à·ƒà¶¸à·–à·„à¶º",
 "Create" => "à¶à¶±à¶±à·Šà¶±",
 "Other" => "à·€à·™à¶±à¶à·Š",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index ecf1a905008d25e7855b2a8145faf32d53b901a6..3941bd51ae719a80c7844524ffbb6cd6889d2a10 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -22,8 +22,17 @@
 "Select an App" => "Vyberte aplikÃ¡ciu",
 "See application page at apps.owncloud.com" => "Pozrite si strÃ¡nku aplikÃ¡ciÃ na apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencovanÃ© <span class=\"author\"></span>",
+"User Documentation" => "PrÃruÄka pouÅ¾ÃvateÄ¾a",
+"Administrator Documentation" => "PrÃruÄka sprÃ¡vcu",
+"Online Documentation" => "Online prÃruÄka",
+"Forum" => "FÃ³rum",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "KomerÄnÃ¡ podpora",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "PouÅ¾ili ste <strong>%s</strong> z <strong>%s</strong> dostupnÃ½ch ",
 "Clients" => "Klienti",
+"Download Desktop Clients" => "StiahnuÅ¥ desktopovÃ©ho klienta",
+"Download Android Client" => "StiahnuÅ¥ Android klienta",
+"Download iOS Client" => "StiahnuÅ¥ iOS klienta",
 "Password" => "Heslo",
 "Your password was changed" => "Heslo bolo zmenenÃ©",
 "Unable to change your password" => "Nie je moÅ¾nÃ© zmeniÅ¥ vaÅ¡e heslo",
@@ -36,11 +45,17 @@
 "Fill in an email address to enable password recovery" => "VyplÅˆte emailovÃº adresu pre aktivovanie obnovy hesla",
 "Language" => "Jazyk",
 "Help translate" => "PomÃ´cÅ¥ s prekladom",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "PouÅ¾ite tÃºto adresu pre pripojenie vÃ¡Å¡ho ownCloud k sÃºborovÃ©mu sprÃ¡vcovi",
+"Version" => "Verzia",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "VyvinutÃ© <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojovÃ½ kÃ³d</a> je licencovanÃ½ pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "Meno",
 "Groups" => "Skupiny",
 "Create" => "VytvoriÅ¥",
+"Default Storage" => "PredvolenÃ© ÃºloÅ¾isko",
+"Unlimited" => "NelimitovanÃ©",
 "Other" => "InÃ©",
 "Group Admin" => "SprÃ¡vca skupiny",
+"Storage" => "ÃšloÅ¾isko",
+"Default" => "PredvolenÃ©",
 "Delete" => "OdstrÃ¡niÅ¥"
 );
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 24bea147993834f7f283c9d9867499b6782e71ba..98d34518478d962df603bdad7e10fb1a46f7ebf8 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v vaÅ¡em upravljalniku datotek.",
 "Version" => "RazliÄica",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"SploÅ¡no javno dovoljenje Affero\">AGPL</abbr></a>.",
-"Name" => "Ime",
 "Groups" => "Skupine",
 "Create" => "Ustvari",
 "Default Storage" => "Privzeta shramba",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index d230adb927548a7e4d968f616764daea9ef6b91d..9f0d428c2e104902e6cbf19f76730516d28208f4 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -37,7 +37,6 @@
 "Language" => "ÐˆÐµÐ·Ð¸Ðº",
 "Help translate" => " ÐŸÐ¾Ð¼Ð¾Ð·Ð¸Ñ‚Ðµ Ñƒ Ð¿Ñ€ÐµÐ²Ð¾Ñ’ÐµÑšÑƒ",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ð Ð°Ð·Ð²Ð¸Ñ˜Ð°Ñ˜Ñƒ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ÐžÑƒÐ½ÐºÐ»Ð°ÑƒÐ´ (ownCloud) Ð·Ð°Ñ˜ÐµÐ´Ð½Ð¸Ñ†Ð°</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">Ð¸Ð·Ð²Ð¾Ñ€Ð½Ð¸ ÐºÐ¾Ð´</a> Ñ˜Ðµ Ð¸Ð·Ð´Ð°Ñ‚ Ð¿Ð¾Ð´ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"ÐÑ„ÐµÑ€Ð¾ ÐˆÐ°Ð²Ð½Ð¾Ð¼ Ð›Ð¸Ñ†ÐµÐ½Ñ†Ð¾Ð¼ (Affero General Public License)\">ÐÐ“ÐŸÐ› Ð»Ð¸Ñ†ÐµÐ½Ñ†Ð¾Ð¼</abbr></a>.",
-"Name" => "Ð˜Ð¼Ðµ",
 "Groups" => "Ð“Ñ€ÑƒÐ¿Ðµ",
 "Create" => "ÐÐ°Ð¿Ñ€Ð°Ð²Ð¸",
 "Other" => "Ð”Ñ€ÑƒÐ³Ð¾",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 7677fbcf33ce055677c8de52f50a4d17cda7860f..942594eb0286794687bc6c70d795d49aa765d95f 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -12,7 +12,6 @@
 "Change password" => "Izmeni lozinku",
 "Email" => "E-mail",
 "Language" => "Jezik",
-"Name" => "Ime",
 "Groups" => "Grupe",
 "Create" => "Napravi",
 "Other" => "Drugo",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index e99fad961728022ffe1d0b41505db000923c0a21..4c30873b3cafaad3b9c32b8f0958e4b011a9d08c 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "AnvÃ¤nd denna adress fÃ¶r att ansluta till ownCloud i din filhanterare",
 "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>.",
-"Name" => "Namn",
 "Groups" => "Grupper",
 "Create" => "Skapa",
 "Default Storage" => "FÃ¶rvald lagring",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 9771e167e4bb3e4f1a5032213a761fe9f5fc0c01..84f6026ca328a4b3040e4f3e0b4c00eee8e64a2b 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -36,7 +36,6 @@
 "Language" => "à®®à¯Šà®´à®¿",
 "Help translate" => "à®®à¯†à®¾à®´à®¿à®ªà¯†à®¯à®°à¯à®•à¯à®• à®‰à®¤à®µà®¿",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "à®ªà¯†à®¯à®°à¯",
 "Groups" => "à®•à¯à®´à¯à®•à¯à®•à®³à¯",
 "Create" => "à®‰à®°à¯à®µà®¾à®•à¯à®•à¯à®•",
 "Other" => "à®®à®±à¯à®±à®µà¯ˆ",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index f4e6398ae21f13bd07fe119b988417901bdeed07..3ef68cf7fe4da500b2e0a7141804b6111d378759 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -10,6 +10,7 @@
 "Unable to delete user" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸¥à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸”à¹‰",
 "Language changed" => "à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸ à¸²à¸©à¸²à¹€à¸£à¸µà¸¢à¸šà¸£à¹‰à¸à¸¢à¹à¸¥à¹‰à¸§",
 "Invalid request" => "à¸„à¸³à¸£à¹‰à¸à¸‡à¸‚à¸à¹„à¸¡à¹ˆà¸–à¸¹à¸à¸•à¹‰à¸à¸‡",
+"Admins can't remove themself from the admin group" => "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸šà¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸¥à¸šà¸•à¸±à¸§à¹€à¸à¸‡à¸à¸à¸à¸ˆà¸²à¸à¸à¸¥à¸¸à¹ˆà¸¡à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¹„à¸”à¹‰",
 "Unable to add user to group %s" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸žà¸´à¹ˆà¸¡à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹€à¸‚à¹‰à¸²à¹„à¸›à¸—à¸µà¹ˆà¸à¸¥à¸¸à¹ˆà¸¡ %s à¹„à¸”à¹‰",
 "Unable to remove user from group %s" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¸¥à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸à¸à¸ˆà¸²à¸à¸à¸¥à¸¸à¹ˆà¸¡ %s à¹„à¸”à¹‰",
 "Disable" => "à¸›à¸´à¸”à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
@@ -21,8 +22,17 @@
 "Select an App" => "à¹€à¸¥à¸·à¸à¸ App",
 "See application page at apps.owncloud.com" => "à¸”à¸¹à¸«à¸™à¹‰à¸²à¹à¸à¸žà¸žà¸¥à¸´à¹€à¸„à¸Šà¸±à¹ˆà¸™à¸—à¸µà¹ˆ apps.owncloud.com",
 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-à¸¥à¸´à¸‚à¸ªà¸´à¸—à¸˜à¸´à¹Œà¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹‚à¸”à¸¢ <span class=\"author\"></span>",
+"User Documentation" => "à¹€à¸à¸à¸ªà¸²à¸£à¸„à¸¹à¹ˆà¸¡à¸·à¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™",
+"Administrator Documentation" => "à¹€à¸à¸à¸ªà¸²à¸£à¸„à¸¹à¹ˆà¸¡à¸·à¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸ªà¸³à¸«à¸£à¸±à¸šà¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸£à¸°à¸šà¸š",
+"Online Documentation" => "à¹€à¸à¸à¸ªà¸²à¸£à¸„à¸¹à¹ˆà¸¡à¸·à¸à¸à¸²à¸£à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¸à¸à¸™à¹„à¸¥à¸™à¹Œ",
+"Forum" => "à¸à¸£à¸°à¸”à¸²à¸™à¸ªà¸™à¸—à¸™à¸²",
+"Bugtracker" => "Bugtracker",
+"Commercial Support" => "à¸šà¸£à¸´à¸à¸²à¸£à¸¥à¸¹à¸à¸„à¹‰à¸²à¹à¸šà¸šà¹€à¸ªà¸µà¸¢à¸„à¹ˆà¸²à¹ƒà¸Šà¹‰à¸ˆà¹ˆà¸²à¸¢",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "à¸„à¸¸à¸“à¹„à¸”à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™à¹„à¸›à¹à¸¥à¹‰à¸§ <strong>%s</strong> à¸ˆà¸²à¸à¸ˆà¸³à¸™à¸§à¸™à¸—à¸µà¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹ƒà¸Šà¹‰à¹„à¸”à¹‰ <strong>%s</strong>",
 "Clients" => "à¸¥à¸¹à¸à¸„à¹‰à¸²",
+"Download Desktop Clients" => "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œà¸ªà¸³à¸«à¸£à¸±à¸šà¹€à¸„à¸£à¸·à¹ˆà¸à¸‡à¹€à¸”à¸ªà¸à¹Œà¸—à¹‡à¸à¸›",
+"Download Android Client" => "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œà¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸à¸™à¸”à¸£à¸à¸¢à¸”à¹Œ",
+"Download iOS Client" => "à¸”à¸²à¸§à¸™à¹Œà¹‚à¸«à¸¥à¸”à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¹„à¸„à¸¥à¹€à¸à¸™à¸•à¹Œà¸ªà¸³à¸«à¸£à¸±à¸š iOS",
 "Password" => "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™",
 "Your password was changed" => "à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¸–à¸¹à¸à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸¥à¹‰à¸§",
 "Unable to change your password" => "à¹„à¸¡à¹ˆà¸ªà¸²à¸¡à¸²à¸£à¸–à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¸‚à¸à¸‡à¸„à¸¸à¸“à¹„à¸”à¹‰",
@@ -35,11 +45,17 @@
 "Fill in an email address to enable password recovery" => "à¸à¸£à¸à¸à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸à¸µà¹€à¸¡à¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“à¹€à¸žà¸·à¹ˆà¸à¹€à¸›à¸´à¸”à¹ƒà¸«à¹‰à¸¡à¸µà¸à¸²à¸£à¸à¸¹à¹‰à¸„à¸·à¸™à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹„à¸”à¹‰",
 "Language" => "à¸ à¸²à¸©à¸²",
 "Help translate" => "à¸Šà¹ˆà¸§à¸¢à¸à¸±à¸™à¹à¸›à¸¥",
+"WebDAV" => "WebDAV",
+"Use this address to connect to your ownCloud in your file manager" => "à¹ƒà¸Šà¹‰à¸—à¸µà¹ˆà¸à¸¢à¸¹à¹ˆà¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸à¸±à¸š ownCloud à¹ƒà¸™à¹‚à¸›à¸£à¹à¸à¸£à¸¡à¸ˆà¸±à¸”à¸à¸²à¸£à¹„à¸Ÿà¸¥à¹Œà¸‚à¸à¸‡à¸„à¸¸à¸“",
+"Version" => "à¸£à¸¸à¹ˆà¸™",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "à¸žà¸±à¸’à¸™à¸²à¹‚à¸”à¸¢ the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">à¸Šà¸¸à¸¡à¸Šà¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰à¸‡à¸²à¸™ ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">à¸‹à¸à¸£à¹Œà¸ªà¹‚à¸„à¹‰à¸”</a>à¸à¸¢à¸¹à¹ˆà¸ à¸²à¸¢à¹ƒà¸•à¹‰à¸ªà¸±à¸à¸à¸²à¸à¸™à¸¸à¸à¸²à¸•à¸‚à¸à¸‡ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Name" => "à¸Šà¸·à¹ˆà¸",
 "Groups" => "à¸à¸¥à¸¸à¹ˆà¸¡",
 "Create" => "à¸ªà¸£à¹‰à¸²à¸‡",
+"Default Storage" => "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸³à¸à¸±à¸”à¸‚à¹‰à¸à¸¡à¸¹à¸¥à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™",
+"Unlimited" => "à¹„à¸¡à¹ˆà¸ˆà¸³à¸à¸±à¸”à¸ˆà¸³à¸™à¸§à¸™",
 "Other" => "à¸à¸·à¹ˆà¸™à¹†",
 "Group Admin" => "à¸œà¸¹à¹‰à¸”à¸¹à¹à¸¥à¸à¸¥à¸¸à¹ˆà¸¡",
+"Storage" => "à¸žà¸·à¹‰à¸™à¸—à¸µà¹ˆà¸ˆà¸±à¸”à¹€à¸à¹‡à¸šà¸‚à¹‰à¸à¸¡à¸¹à¸¥",
+"Default" => "à¸„à¹ˆà¸²à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™",
 "Delete" => "à¸¥à¸š"
 );
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index f754bb90fcf23df40d888b69eebf189b56e33b49..281e01e11622859f916e0776135fc1b221e23f8d 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -44,7 +44,6 @@
 "WebDAV" => "WebDAV",
 "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>.",
-"Name" => "Ad",
 "Groups" => "Gruplar",
 "Create" => "OluÅŸtur",
 "Other" => "DiÄŸer",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index ce1ced031b166c3e44c23a7c64e508ea67d410b2..dc2c537b4fb9080b6ceea959a3ec00b8dbc732b0 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -49,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "Ð’Ð¸ÐºÐ¾Ñ€Ð¸ÑÑ‚Ð¾Ð²ÑƒÐ¹Ñ‚Ðµ Ñ†ÑŽ Ð°Ð´Ñ€ÐµÑÑƒ Ð´Ð»Ñ Ð¿Ñ–Ð´'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð´Ð¾ Ð²Ð°ÑˆÐ¾Ð³Ð¾ ownCloud Ñƒ Ð²Ð°ÑˆÐ¾Ð¼Ñƒ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¾Ð¼Ñƒ Ð¼ÐµÐ½ÐµÐ´Ð¶ÐµÑ€Ñ–",
 "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>.",
-"Name" => "Ð†Ð¼'Ñ",
 "Groups" => "Ð“Ñ€ÑƒÐ¿Ð¸",
 "Create" => "Ð¡Ñ‚Ð²Ð¾Ñ€Ð¸Ñ‚Ð¸",
+"Default Storage" => "ÑÑ…Ð¾Ð²Ð¸Ñ‰Ðµ Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼",
+"Unlimited" => "ÐÐµÐ¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð¾",
 "Other" => "Ð†Ð½ÑˆÐµ",
 "Group Admin" => "ÐÐ´Ð¼Ñ–Ð½Ñ–ÑÑ‚Ñ€Ð°Ñ‚Ð¾Ñ€ Ð³Ñ€ÑƒÐ¿Ð¸",
+"Storage" => "Ð¡Ñ…Ð¾Ð²Ð¸Ñ‰Ðµ",
+"Default" => "Ð—Ð° Ð·Ð°Ð¼Ð¾Ð²Ñ‡ÑƒÐ²Ð°Ð½Ð½ÑÐ¼",
 "Delete" => "Ð’Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸"
 );
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 2354ba2a16e4da4cb2caaa7316d39a8a7514c66e..39b09aa938237a44a422328f135c7b67d3c6f119 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -37,7 +37,6 @@
 "Language" => "NgÃ´n ngá»¯",
 "Help translate" => "Há»— trá»£ dá»‹ch thuáº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>." => "ÄÆ°á»£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>.",
-"Name" => "TÃªn",
 "Groups" => "NhÃ³m",
 "Create" => "Táº¡o",
 "Other" => "KhÃ¡c",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index b34b20d5aedb53305af61068e61b8103653c8ee3..f8e37ac749f0b433b83818ebdb377ee8bbc362b7 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -35,7 +35,6 @@
 "Language" => "è¯è¨€",
 "Help translate" => "å¸®åŠ©ç¿»è¯‘",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "ç”± <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud ç¤¾åŒº</a>å¼€å‘ï¼Œ<a href=\"https://github.com/owncloud\" target=\"_blank\">sæºä»£ç </a> ä»¥ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> è®¸å¯åè®®å‘å¸ƒã€‚",
-"Name" => "åå—",
 "Groups" => "ç»„",
 "Create" => "æ–°å»º",
 "Other" => "å…¶ä»–çš„",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 218095b78eb94e4b3c6936d9d38e14630f80f22d..dfcf7bf7bfee1ef30e40e5b9bbafe7414c86fccd 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -49,10 +49,13 @@
 "Use this address to connect to your ownCloud in your file manager" => "ç”¨è¯¥åœ°å€æ¥è¿žæŽ¥æ–‡ä»¶ç®¡ç†å™¨ä¸çš„ ownCloud",
 "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>è®¸å¯è¯ä¸‹å‘å¸ƒã€‚",
-"Name" => "åç§°",
 "Groups" => "ç»„",
 "Create" => "åˆ›å»º",
+"Default Storage" => "é»˜è®¤å˜å‚¨",
+"Unlimited" => "æ— é™",
 "Other" => "å…¶å®ƒ",
 "Group Admin" => "ç»„ç®¡ç†å‘˜",
+"Storage" => "å˜å‚¨",
+"Default" => "é»˜è®¤",
 "Delete" => "åˆ é™¤"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 7681b10affa973001e964c64c04181d172a8a313..5fe555d14f090a8bd1497b3709df1cd44621afa1 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -49,7 +49,6 @@
 "Use this address to connect to your ownCloud in your file manager" => "åœ¨æ‚¨çš„æª”æ¡ˆç®¡ç†å“¡ä¸ä½¿ç”¨é€™å€‹åœ°å€ä¾†é€£ç·šåˆ° ownCloud",
 "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>è¨±å¯è‰ä¸‹ç™¼å¸ƒã€‚",
-"Name" => "åç¨±",
 "Groups" => "ç¾¤çµ„",
 "Create" => "å‰µé€ ",
 "Default Storage" => "é è¨å„²å˜å€",
diff --git a/settings/personal.php b/settings/personal.php
index 47dbcc53ebc5c4c71a6275e190f2dcf7b0ff3224..4624bda839786960ff79c603fdaddf0217f5a0f2 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -15,15 +15,7 @@ OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
 OC_Util::addStyle( '3rdparty', 'chosen' );
 OC_App::setActiveNavigationEntry( 'personal' );
 
-// calculate the disc space
-$rootInfo=OC_FileCache::get('');
-$sharedInfo=OC_FileCache::get('/Shared');
-$used=$rootInfo['size'];
-if($used<0) $used=0;
-$free=OC_Filesystem::free_space();
-$total=$free+$used;
-if($total==0) $total=1;  // prevent division by zero
-$relative=round(($used/$total)*10000)/100;
+$storageInfo=OC_Helper::getStorageInfo();
 
 $email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 
@@ -50,9 +42,9 @@ foreach($languageCodes as $lang) {
 
 // Return template
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
-$tmpl->assign('usage', OC_Helper::humanFileSize($used));
-$tmpl->assign('total_space', OC_Helper::humanFileSize($total));
-$tmpl->assign('usage_relative', $relative);
+$tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
+$tmpl->assign('total_space', OC_Helper::humanFileSize($storageInfo['total']));
+$tmpl->assign('usage_relative', $storageInfo['relative']);
 $tmpl->assign('email', $email);
 $tmpl->assign('languages', $languages);
 
diff --git a/settings/routes.php b/settings/routes.php
index fa78f5665259047c3e1870985acff78a717c106e..0a8af0dde2b35ba068b5d77ed2b0994d475722fd 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -39,6 +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');
 // personel
 $this->create('settings_ajax_lostpassword', '/settings/ajax/lostpassword.php')
 	->actionInclude('settings/ajax/lostpassword.php');
@@ -55,6 +57,8 @@ $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
 	->actionInclude('settings/ajax/updateapp.php');
 $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
 	->actionInclude('settings/ajax/navigationdetect.php');
+$this->create('apps_custom', '/settings/js/apps-custom.js')
+	->actionInclude('settings/js/apps-custom.php');
 // admin
 $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
 	->actionInclude('settings/ajax/getlog.php');
@@ -62,3 +66,5 @@ $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
 	->actionInclude('settings/ajax/setloglevel.php');
 $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
 	->actionInclude('settings/ajax/setsecurity.php');
+$this->create('isadmin', '/settings/js/isadmin.js')
+	->actionInclude('settings/js/isadmin.php');
diff --git a/settings/settings.php b/settings/settings.php
index add94b5b01135ff54018268c0a5dee077ddf1307..1e05452ec4d1b612e43720f9006f17275c97477c 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -6,7 +6,6 @@
  */
 
 OC_Util::checkLoggedIn();
-OC_Util::verifyUser();
 OC_App::loadApps();
 
 OC_Util::addStyle( 'settings', 'settings' );
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5ee0147fbcb32fc42f0e593fd8da328bf7bc235c..0097489743f6230bb1abea6d54c8490f4e933ea9 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -10,13 +10,13 @@ $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
 
 // is htaccess working ?
 if (!$_['htaccessworking']) {
-    ?>
+	?>
 <fieldset class="personalblock">
-    <legend><strong><?php echo $l->t('Security Warning');?></strong></legend>
+	<legend><strong><?php echo $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.'); ?>
-    </span>
+		<?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.'); ?>
+	</span>
 
 </fieldset>
 <?php
@@ -24,13 +24,13 @@ if (!$_['htaccessworking']) {
 
 // is locale working ?
 if (!$_['islocaleworking']) {
-    ?>
+	?>
 <fieldset class="personalblock">
-    <legend><strong><?php echo $l->t('Locale not working');?></strong></legend>
+	<legend><strong><?php echo $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". 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.'); ?>
-    </span>
+		<span class="connectionwarning">
+		<?php echo $l->t('This ownCloud server can\'t set system locale to "en_US.UTF-8". 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.'); ?>
+	</span>
 
 </fieldset>
 <?php
@@ -38,13 +38,13 @@ if (!$_['islocaleworking']) {
 
 // is internet connection working ?
 if (!$_['internetconnectionworking']) {
-    ?>
+	?>
 <fieldset class="personalblock">
-    <legend><strong><?php echo $l->t('Internet connection not working');?></strong></legend>
+	<legend><strong><?php echo $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.'); ?>
-    </span>
+		<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.'); ?>
+	</span>
 
 </fieldset>
 <?php
@@ -52,152 +52,152 @@ if (!$_['internetconnectionworking']) {
 ?>
 
 <?php foreach ($_['forms'] as $form) {
-    echo $form;
+	echo $form;
 }
 ;?>
 
 <fieldset class="personalblock" id="backgroundjobs">
-    <legend><strong><?php echo $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"';
-                } ?>>
-                <label for="backgroundjobs_ajax">AJAX</label><br/>
-                <em><?php echo $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"';
-                } ?>>
-                <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>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <input type="radio" name="mode" value="cron"
-                       id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
-                    echo '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>
-            </td>
-        </tr>
-    </table>
+	<legend><strong><?php echo $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"';
+				} ?>>
+				<label for="backgroundjobs_ajax">AJAX</label><br/>
+				<em><?php echo $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"';
+				} ?>>
+				<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>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<input type="radio" name="mode" value="cron"
+					   id="backgroundjobs_cron" <?php if ($_['backgroundjobs_mode'] == "cron") {
+					echo '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>
+			</td>
+		</tr>
+	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">
-    <legend><strong><?php echo $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>
-            </td>
-        </tr>
-        <tr>
-            <td <?php if ($_['shareAPIEnabled'] == 'no') echo '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>
-            </td>
-        </tr>
-        <tr>
-            <td <?php if ($_['shareAPIEnabled'] == 'no') echo '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>
-            </td>
-        </tr>
-        <tr>
-            <td <?php if ($_['shareAPIEnabled'] == 'no') echo '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/>
-                <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/>
-            </td>
-        </tr>
-    </table>
+	<legend><strong><?php echo $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>
+			</td>
+		</tr>
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo '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>
+			</td>
+		</tr>
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo '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>
+			</td>
+		</tr>
+		<tr>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo '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/>
+				<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/>
+			</td>
+		</tr>
+	</table>
 </fieldset>
 
 <fieldset class="personalblock" id="security">
-    <legend><strong><?php echo $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"';
-                    }  else {
-                        echo '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']) {
-                    echo "<br/><em>"; 
-                    echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.'); 
-                    echo "</em>"; 
-                } 
-                ?>
-            </td>
-        </tr>
-    </table>
+	<legend><strong><?php echo $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"';
+					}  else {
+						echo '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']) {
+					echo "<br/><em>";
+					echo $l->t('Please connect to this ownCloud instance via HTTPS to enable or disable the SSL enforcement.');
+					echo "</em>";
+				}
+				?>
+			</td>
+		</tr>
+	</table>
 </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>
-    <?php for ($i = 0; $i < 5; $i++):
-    if ($i != $_['loglevel']):?>
-        <option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
-        <?php endif;
+	<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>
+	<?php for ($i = 0; $i < 5; $i++):
+	if ($i != $_['loglevel']):?>
+		<option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
+		<?php endif;
 endfor;?>
 </select>
-    <table id='log'>
-        <?php foreach ($_['entries'] as $entry): ?>
-        <tr>
-            <td>
-                <?php echo $levels[$entry->level];?>
-            </td>
-            <td>
-                <?php echo $entry->app;?>
-            </td>
-            <td>
-                <?php echo $entry->message;?>
-            </td>
-            <td>
-                <?php echo 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>
-    <?php endif; ?>
+	<table id='log'>
+		<?php foreach ($_['entries'] as $entry): ?>
+		<tr>
+			<td>
+				<?php echo $levels[$entry->level];?>
+			</td>
+			<td>
+				<?php echo $entry->app;?>
+			</td>
+			<td>
+				<?php echo $entry->message;?>
+			</td>
+			<td>
+				<?php echo OC_Util::formatDate($entry->time);?>
+			</td>
+		</tr>
+		<?php endforeach;?>
+	</table>
+	<?php if ($_['entriesremain']): ?>
+	<input id='moreLog' type='button' value='<?php echo $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 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>.'); ?>
 </fieldset>
 
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 7b5eaea9cd14c7b0ed4f25d852305b75a6889165..bbd5de1fcbd7d8aa200d34ad6b6e21dc1e89c0c8 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -3,9 +3,9 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */?>
-<script type='text/javascript'>
-	var appid = '<?php echo $_['appid']; ?>';
-</script>
+ <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>
+
 <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>
@@ -29,7 +29,7 @@
 	<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="license hidden"><?php echo $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')); ?>" />
 	</div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index b697905f7efe92b746c6957b76c4aefd66595a1d..7383fdcf56a069d95a208a7e3de6f934da97937b 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,35 +1,14 @@
 <div id="controls">
-        <?php if($_['admin']) { ?>
+	<?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 echo($_['style2']); ?>" href="<?php echo($_['url2']); ?>"><?php echo $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>
-        <?php if($_['admin']) { ?>
+	<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>
+	<?php if($_['admin']) { ?>
 		<a class="button newquestion" href="https://github.com/owncloud/core/issues" target="_blank"><?php echo $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 echo $l->t( 'Commercial Support' ); ?></a>
 </div>
 <br /><br />
-<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
-
-
-<script language="JavaScript">
-<!--
-
-function pageY(elem) {
-    return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
-}
-var buffer = 5; //scroll bar buffer
-function resizeIframe() {
-    var height = document.documentElement.clientHeight;
-    height -= pageY(document.getElementById('ifm'))+ buffer ;
-    height = (height < 0) ? 0 : height;
-    document.getElementById('ifm').style.height = height + 'px';
-}
-
-document.getElementById('ifm').onload=resizeIframe;
-window.onresize = resizeIframe;
-
-//-->
-</script>
+<iframe src="<?php echo($_['url']); ?>" width="100%" id="ifm" ></iframe>
\ No newline at end of file
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 35eb0ef5e9a30e5f4d229fe9e58e5260c149acaa..0e1677bdea8cdc536268f9cc5dfc3366182b69c7 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -62,7 +62,7 @@
 <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>.'); ?>
+	<?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>.'); ?>
 </fieldset>
 
 
diff --git a/settings/templates/users.php b/settings/templates/users.php
index e8bf9edf60408905bc215f5da84f17ac10fa8b34..f30c21efaef4a0fbd96bb59725f1a2cff4f813be 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -13,12 +13,12 @@ $items = array_flip($_['subadmingroups']);
 unset($items['admin']);
 $_['subadmingroups'] = array_flip($items);
 ?>
-<script>
-var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
-</script>
+
+<script type="text/javascript" src="<?php echo OC_Helper::linkToRoute('isadmin');?>"></script>
+
 <div id="controls">
 	<form id="newuser" autocomplete="off">
-		<input id="newusername" type="text" placeholder="<?php echo $l->t('Name')?>" /> <input
+		<input id="newusername" type="text" placeholder="<?php echo $l->t('Login Name')?>" /> <input
 			type="password" id="newuserpassword"
 			placeholder="<?php echo $l->t('Password')?>" /> <select
 			class="groupsselect"
@@ -36,11 +36,11 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 		<div class="quota-select-wrapper">
 			<?php if((bool) $_['isadmin']): ?>
 			<select class='quota'>
-                <option
-                    <?php if($_['default_quota']=='none') echo 'selected="selected"';?>
-                        value='none'>
-                    <?php echo $l->t('Unlimited');?>
-                </option>
+				<option
+					<?php if($_['default_quota']=='none') echo 'selected="selected"';?>
+						value='none'>
+					<?php echo $l->t('Unlimited');?>
+				</option>
 				<?php foreach($_['quota_preset'] as $preset):?>
 				<?php if($preset!='default'):?>
 				<option
@@ -73,12 +73,11 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 	</div>
 </div>
 
-<div id='notification'></div>
-
 <table data-groups="<?php echo implode(', ', $allGroups);?>">
 	<thead>
 		<tr>
-			<th id='headerName'><?php echo $l->t('Name')?></th>
+			<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>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
@@ -90,8 +89,13 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 	</thead>
 	<tbody>
 		<?php foreach($_["users"] as $user): ?>
-		<tr data-uid="<?php echo $user["name"] ?>">
+		<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="change display name" title="change display name"/>
+			</td>
 			<td class="password"><span>â—â—â—â—â—â—â—</span> <img class="svg action"
 				src="<?php echo image_path('core', 'actions/rename.svg')?>"
 				alt="set new password" title="set new password"/>
@@ -127,16 +131,16 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 			<td class="quota">
 				<div class="quota-select-wrapper">
 					<select class='quota-user'>
-                        <option
-                            <?php if($user['quota']=='default') echo 'selected="selected"';?>
-                                value='default'>
-                            <?php echo $l->t('Default');?>
-                        </option>
-                        <option
-                        <?php if($user['quota']=='none') echo 'selected="selected"';?>
-                                value='none'>
-                            <?php echo $l->t('Unlimited');?>
-                        </option>
+						<option
+							<?php if($user['quota']=='default') echo 'selected="selected"';?>
+								value='default'>
+							<?php echo $l->t('Default');?>
+						</option>
+						<option
+						<?php if($user['quota']=='none') echo 'selected="selected"';?>
+								value='none'>
+							<?php echo $l->t('Unlimited');?>
+						</option>
 						<?php foreach($_['quota_preset'] as $preset):?>
 						<option
 						<?php if($user['quota']==$preset) echo 'selected="selected"';?>
diff --git a/settings/users.php b/settings/users.php
index 07a7620d3c04b7d37b2010492037c9b3ed232c1f..ab7a7aed73481ca06e677af94d4dbfb5108fc9dd 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -18,14 +18,15 @@ OC_App::setActiveNavigationEntry( 'core_users' );
 $users = array();
 $groups = array();
 
-$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
+$isadmin = OC_User::isAdminUser(OC_User::getUser());
+
 if($isadmin) {
 	$accessiblegroups = OC_Group::getGroups();
-	$accessibleusers = OC_User::getUsers('', 30);
+	$accessibleusers = OC_User::getDisplayNames('', 30);
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
 }else{
 	$accessiblegroups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
-	$accessibleusers = OC_Group::usersInGroups($accessiblegroups, '', 30);
+	$accessibleusers = OC_Group::displayNamesInGroups($accessiblegroups, '', 30);
 	$subadmins = false;
 }
 
@@ -33,7 +34,7 @@ if($isadmin) {
 $quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', '1 GB, 5 GB, 10 GB');
 $quotaPreset=explode(',', $quotaPreset);
 foreach($quotaPreset as &$preset) {
-    $preset=trim($preset);
+	$preset=trim($preset);
 }
 $quotaPreset=array_diff($quotaPreset, array('default', 'none'));
 
@@ -41,16 +42,22 @@ $defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
 $defaultQuotaIsUserDefined=array_search($defaultQuota, $quotaPreset)===false && array_search($defaultQuota, array('none', 'default'))===false;
 
 // load users and quota
-foreach($accessibleusers as $i) {
-    $quota=OC_Preferences::getValue($i, 'files', 'quota', 'default');
-    $isQuotaUserDefined=array_search($quota, $quotaPreset)===false && array_search($quota, array('none', 'default'))===false;
+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;
 
+	$name = $displayName;
+	if ( $displayName != $uid ) {
+		$name = $name . ' ('.$uid.')';
+	} 
+	
 	$users[] = array(
-		"name" => $i,
-		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
-        'quota'=>$quota,
-        'isQuotaUserDefined'=>$isQuotaUserDefined,
-		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
+		"name" => $uid,
+		"displayName" => $displayName, 
+		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($uid)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
+		'quota'=>$quota,
+		'isQuotaUserDefined'=>$isQuotaUserDefined,
+		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($uid)));
 }
 
 foreach( $accessiblegroups as $i ) {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 115a15883a08461638b874aee22c570c61918762..b97161ee6e4263ff3561ee9a64d9d1896b2407dd 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -8,24 +8,5 @@ if(!class_exists('PHPUnit_Framework_TestCase')) {
 	require_once('PHPUnit/Autoload.php');
 }
 
-//SimpleTest compatibility
-abstract class UnitTestCase extends PHPUnit_Framework_TestCase{
-	function assertEqual($expected, $actual, $string='') {
-		$this->assertEquals($expected, $actual, $string);
-	}
-
-	function assertNotEqual($expected, $actual, $string='') {
-		$this->assertNotEquals($expected, $actual, $string);
-	}
-
-	static function assertTrue($actual, $string='') {
-		parent::assertTrue((bool)$actual, $string);
-	}
-
-	static function assertFalse($actual, $string='') {
-		parent::assertFalse((bool)$actual, $string);
-	}
-}
-
 OC_Hook::clear();
 OC_Log::$enabled = false;
diff --git a/tests/enable_all.php b/tests/enable_all.php
index 16838398f1751d5a8e63f18ea5eac9fabe9bc64b..44af0115650dff1e6f52f756c96ae49b3bfc6067 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -10,7 +10,8 @@ require_once __DIR__.'/../lib/base.php';
 
 OC_App::enable('calendar');
 OC_App::enable('contacts');
-OC_App::enable('apptemplate_advanced');
+OC_App::enable('apptemplateadvanced');
+OC_App::enable('appframework');
 #OC_App::enable('files_archive');
 #OC_App::enable('mozilla_sync');
 #OC_App::enable('news');
diff --git a/tests/lib/archive.php b/tests/lib/archive.php
index cd2ca6630a5f6d99cb4ec464ce4b37ba34d06fea..be5cc897a67b1134f824700080abd21b3edb9b7a 100644
--- a/tests/lib/archive.php
+++ b/tests/lib/archive.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-abstract class Test_Archive extends UnitTestCase {
+abstract class Test_Archive extends PHPUnit_Framework_TestCase {
 	/**
 	 * @var OC_Archive
 	 */
@@ -27,7 +27,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->instance=$this->getExisting();
 		$allFiles=$this->instance->getFiles();
 		$expected=array('lorem.txt','logo-wide.png','dir/', 'dir/lorem.txt');
-		$this->assertEqual(4, count($allFiles), 'only found '.count($allFiles).' out of 4 expected files');
+		$this->assertEquals(4, count($allFiles), 'only found '.count($allFiles).' out of 4 expected files');
 		foreach($expected as $file) {
 			$this->assertContains($file, $allFiles, 'cant find '.  $file . ' in archive');
 			$this->assertTrue($this->instance->fileExists($file), 'file '.$file.' does not exist in archive');
@@ -36,14 +36,14 @@ abstract class Test_Archive extends UnitTestCase {
 
 		$rootContent=$this->instance->getFolder('');
 		$expected=array('lorem.txt','logo-wide.png', 'dir/');
-		$this->assertEqual(3, count($rootContent));
+		$this->assertEquals(3, count($rootContent));
 		foreach($expected as $file) {
 			$this->assertContains($file, $rootContent, 'cant find '.  $file . ' in archive');
 		}
 
 		$dirContent=$this->instance->getFolder('dir/');
 		$expected=array('lorem.txt');
-		$this->assertEqual(1, count($dirContent));
+		$this->assertEquals(1, count($dirContent));
 		foreach($expected as $file) {
 			$this->assertContains($file, $dirContent, 'cant find '.  $file . ' in archive');
 		}
@@ -53,36 +53,36 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->instance=$this->getExisting();
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$textFile=$dir.'/lorem.txt';
-		$this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt'));
+		$this->assertEquals(file_get_contents($textFile), $this->instance->getFile('lorem.txt'));
 
 		$tmpFile=OCP\Files::tmpFile('.txt');
 		$this->instance->extractFile('lorem.txt', $tmpFile);
-		$this->assertEqual(file_get_contents($textFile), file_get_contents($tmpFile));
+		$this->assertEquals(file_get_contents($textFile), file_get_contents($tmpFile));
 	}
 
 	public function testWrite() {
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$textFile=$dir.'/lorem.txt';
 		$this->instance=$this->getNew();
-		$this->assertEqual(0, count($this->instance->getFiles()));
+		$this->assertEquals(0, count($this->instance->getFiles()));
 		$this->instance->addFile('lorem.txt', $textFile);
-		$this->assertEqual(1, count($this->instance->getFiles()));
+		$this->assertEquals(1, count($this->instance->getFiles()));
 		$this->assertTrue($this->instance->fileExists('lorem.txt'));
 		$this->assertFalse($this->instance->fileExists('lorem.txt/'));
 
-		$this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt'));
+		$this->assertEquals(file_get_contents($textFile), $this->instance->getFile('lorem.txt'));
 		$this->instance->addFile('lorem.txt', 'foobar');
-		$this->assertEqual('foobar', $this->instance->getFile('lorem.txt'));
+		$this->assertEquals('foobar', $this->instance->getFile('lorem.txt'));
 	}
 
 	public function testReadStream() {
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$this->instance=$this->getExisting();
 		$fh=$this->instance->getStream('lorem.txt', 'r');
-		$this->assertTrue($fh);
+		$this->assertTrue((bool)$fh);
 		$content=fread($fh, $this->instance->filesize('lorem.txt'));
 		fclose($fh);
-		$this->assertEqual(file_get_contents($dir.'/lorem.txt'), $content);
+		$this->assertEquals(file_get_contents($dir.'/lorem.txt'), $content);
 	}
 	public function testWriteStream() {
 		$dir=OC::$SERVERROOT.'/tests/data';
@@ -93,7 +93,7 @@ abstract class Test_Archive extends UnitTestCase {
 		fclose($source);
 		fclose($fh);
 		$this->assertTrue($this->instance->fileExists('lorem.txt'));
-		$this->assertEqual(file_get_contents($dir.'/lorem.txt'), $this->instance->getFile('lorem.txt'));
+		$this->assertEquals(file_get_contents($dir.'/lorem.txt'), $this->instance->getFile('lorem.txt'));
 	}
 	public function testFolder() {
 		$this->instance=$this->getNew();
@@ -111,10 +111,10 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->instance=$this->getExisting();
 		$tmpDir=OCP\Files::tmpFolder();
 		$this->instance->extract($tmpDir);
-		$this->assertEqual(true, file_exists($tmpDir.'lorem.txt'));
-		$this->assertEqual(true, file_exists($tmpDir.'dir/lorem.txt'));
-		$this->assertEqual(true, file_exists($tmpDir.'logo-wide.png'));
-		$this->assertEqual(file_get_contents($dir.'/lorem.txt'), file_get_contents($tmpDir.'lorem.txt'));
+		$this->assertEquals(true, file_exists($tmpDir.'lorem.txt'));
+		$this->assertEquals(true, file_exists($tmpDir.'dir/lorem.txt'));
+		$this->assertEquals(true, file_exists($tmpDir.'logo-wide.png'));
+		$this->assertEquals(file_get_contents($dir.'/lorem.txt'), file_get_contents($tmpDir.'lorem.txt'));
 		OCP\Files::rmdirr($tmpDir);
 	}
 	public function testMoveRemove() {
@@ -126,7 +126,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->instance->rename('lorem.txt', 'target.txt');
 		$this->assertTrue($this->instance->fileExists('target.txt'));
 		$this->assertFalse($this->instance->fileExists('lorem.txt'));
-		$this->assertEqual(file_get_contents($textFile), $this->instance->getFile('target.txt'));
+		$this->assertEquals(file_get_contents($textFile), $this->instance->getFile('target.txt'));
 		$this->instance->remove('target.txt');
 		$this->assertFalse($this->instance->fileExists('target.txt'));
 	}
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 1a1287ff1352af6eb2fdb846e2f25a837d047c12..3dcf39f7d605df9b0c325264b25414c6f8d037e5 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-abstract class Test_Cache extends UnitTestCase {
+abstract class Test_Cache extends PHPUnit_Framework_TestCase {
 	/**
 	 * @var OC_Cache cache;
 	 */
@@ -26,19 +26,19 @@ abstract class Test_Cache extends UnitTestCase {
 		$this->instance->set('value1', $value);
 		$this->assertTrue($this->instance->hasKey('value1'));
 		$received=$this->instance->get('value1');
-		$this->assertEqual($value, $received, 'Value recieved from cache not equal to the original');
+		$this->assertEquals($value, $received, 'Value recieved from cache not equal to the original');
 		$value='ipsum lorum';
 		$this->instance->set('value1', $value);
 		$received=$this->instance->get('value1');
-		$this->assertEqual($value, $received, 'Value not overwritten by second set');
+		$this->assertEquals($value, $received, 'Value not overwritten by second set');
 
 		$value2='foobar';
 		$this->instance->set('value2', $value2);
 		$received2=$this->instance->get('value2');
 		$this->assertTrue($this->instance->hasKey('value1'));
 		$this->assertTrue($this->instance->hasKey('value2'));
-		$this->assertEqual($value, $received, 'Value changed while setting other variable');
-		$this->assertEqual($value2, $received2, 'Second value not equal to original');
+		$this->assertEquals($value, $received, 'Value changed while setting other variable');
+		$this->assertEquals($value2, $received2, 'Second value not equal to original');
 
 		$this->assertFalse($this->instance->hasKey('not_set'));
 		$this->assertNull($this->instance->get('not_set'), 'Unset value not equal to null');
diff --git a/tests/lib/db.php b/tests/lib/db.php
index c2eb38dae8367ba1a174305539db0c4610917557..440f3fb6bfd5be3ca5a98726834eb6e6509eb0f6 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_DB extends UnitTestCase {
+class Test_DB extends PHPUnit_Framework_TestCase {
 	protected $backupGlobals = FALSE;
 
 	protected static $schema_file = 'static://test_db_scheme';
@@ -35,18 +35,18 @@ class Test_DB extends UnitTestCase {
 	public function testQuotes() {
 		$query = OC_DB::prepare('SELECT `fullname` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
 		$result = $query->execute(array('uri_1'));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
 		$this->assertFalse($row);
 		$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (?,?)');
 		$result = $query->execute(array('fullname test', 'uri_1'));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
 		$result = $query->execute(array('uri_1'));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
 		$this->assertArrayHasKey('fullname', $row);
-		$this->assertEqual($row['fullname'], 'fullname test');
+		$this->assertEquals($row['fullname'], 'fullname test');
 		$row = $result->fetchRow();
 		$this->assertFalse($row);
 	}
@@ -54,19 +54,19 @@ class Test_DB extends UnitTestCase {
 	public function testNOW() {
 		$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (NOW(),?)');
 		$result = $query->execute(array('uri_2'));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
 		$result = $query->execute(array('uri_2'));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 	}
 
 	public function testUNIX_TIMESTAMP() {
 		$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`,`uri`) VALUES (UNIX_TIMESTAMP(),?)');
 		$result = $query->execute(array('uri_3'));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 		$query = OC_DB::prepare('SELECT `fullname`,`uri` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
 		$result = $query->execute(array('uri_3'));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 	}
 
 	public function testinsertIfNotExist() {
@@ -85,13 +85,13 @@ class Test_DB extends UnitTestCase {
 					'type' => $entry['type'],
 					'category' => $entry['category'],
 				));
-			$this->assertTrue($result);
+			$this->assertTrue((bool)$result);
 		}
 
 		$query = OC_DB::prepare('SELECT * FROM *PREFIX*'.$this->table3);
 		$result = $query->execute();
-		$this->assertTrue($result);
-		$this->assertEqual('4', $result->numRows());
+		$this->assertTrue((bool)$result);
+		$this->assertEquals('4', $result->numRows());
 	}
 
 	public function testinsertIfNotExistDontOverwrite() {
@@ -102,14 +102,14 @@ class Test_DB extends UnitTestCase {
 		// Normal test to have same known data inserted.
 		$query = OC_DB::prepare('INSERT INTO *PREFIX*'.$this->table2.' (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)');
 		$result = $query->execute(array($fullname, $uri, $carddata));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 		$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
 		$result = $query->execute(array($uri));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
 		$this->assertArrayHasKey('carddata', $row);
-		$this->assertEqual($carddata, $row['carddata']);
-		$this->assertEqual('1', $result->numRows());
+		$this->assertEquals($carddata, $row['carddata']);
+		$this->assertEquals('1', $result->numRows());
 
 		// Try to insert a new row
 		$result = OC_DB::insertIfNotExist('*PREFIX*'.$this->table2,
@@ -117,17 +117,17 @@ class Test_DB extends UnitTestCase {
 				'fullname' => $fullname,
 				'uri' => $uri,
 			));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 
 		$query = OC_DB::prepare('SELECT `fullname`, `uri`, `carddata` FROM *PREFIX*'.$this->table2.' WHERE `uri` = ?');
 		$result = $query->execute(array($uri));
-		$this->assertTrue($result);
+		$this->assertTrue((bool)$result);
 		$row = $result->fetchRow();
 		$this->assertArrayHasKey('carddata', $row);
 		// Test that previously inserted data isn't overwritten
-		$this->assertEqual($carddata, $row['carddata']);
+		$this->assertEquals($carddata, $row['carddata']);
 		// And that a new row hasn't been inserted.
-		$this->assertEqual('1', $result->numRows());
+		$this->assertEquals('1', $result->numRows());
 
 	}
 }
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index cd408160afb3770ddaeeb28363602ca51e3b7013..fb60ce7dbb7d3f542fe975a18dba672227b7fca1 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_DBSchema extends UnitTestCase {
+class Test_DBSchema extends PHPUnit_Framework_TestCase {
 	protected static $schema_file = 'static://test_db_scheme';
 	protected static $schema_file2 = 'static://test_db_scheme2';
 	protected $test_prefix;
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index e82a6f54e3d2773c1efe3183ad466adc0ea3970f..c408efb754321bbfc78e0f4e0955f8c84417f424 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -20,7 +20,7 @@
  *
  */
 
-abstract class Test_FileStorage extends UnitTestCase {
+abstract class Test_FileStorage extends PHPUnit_Framework_TestCase {
 	/**
 	 * @var OC_Filestorage instance
 	 */
@@ -34,7 +34,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue($this->instance->isReadable('/'), 'Root folder is not readable');
 		$this->assertTrue($this->instance->is_dir('/'), 'Root folder is not a directory');
 		$this->assertFalse($this->instance->is_file('/'), 'Root folder is a file');
-		$this->assertEqual('dir', $this->instance->filetype('/'));
+		$this->assertEquals('dir', $this->instance->filetype('/'));
 
 		//without this, any further testing would be useless, not an acutal requirement for filestorage though
 		$this->assertTrue($this->instance->isUpdatable('/'), 'Root folder is not writable');
@@ -48,8 +48,8 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue($this->instance->file_exists('/folder'));
 		$this->assertTrue($this->instance->is_dir('/folder'));
 		$this->assertFalse($this->instance->is_file('/folder'));
-		$this->assertEqual('dir', $this->instance->filetype('/folder'));
-		$this->assertEqual(0, $this->instance->filesize('/folder'));
+		$this->assertEquals('dir', $this->instance->filetype('/folder'));
+		$this->assertEquals(0, $this->instance->filesize('/folder'));
 		$this->assertTrue($this->instance->isReadable('/folder'));
 		$this->assertTrue($this->instance->isUpdatable('/folder'));
 
@@ -60,7 +60,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 				$content[] = $file;
 			}
 		}
-		$this->assertEqual(array('folder'), $content);
+		$this->assertEquals(array('folder'), $content);
 
 		$this->assertFalse($this->instance->mkdir('/folder')); //cant create existing folders
 		$this->assertTrue($this->instance->rmdir('/folder'));
@@ -76,7 +76,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 				$content[] = $file;
 			}
 		}
-		$this->assertEqual(array(), $content);
+		$this->assertEquals(array(), $content);
 	}
 
 	/**
@@ -89,31 +89,31 @@ abstract class Test_FileStorage extends UnitTestCase {
 		//fill a file with string data
 		$this->instance->file_put_contents('/lorem.txt', $sourceText);
 		$this->assertFalse($this->instance->is_dir('/lorem.txt'));
-		$this->assertEqual($sourceText, $this->instance->file_get_contents('/lorem.txt'), 'data returned from file_get_contents is not equal to the source data');
+		$this->assertEquals($sourceText, $this->instance->file_get_contents('/lorem.txt'), 'data returned from file_get_contents is not equal to the source data');
 
 		//empty the file
 		$this->instance->file_put_contents('/lorem.txt', '');
-		$this->assertEqual('', $this->instance->file_get_contents('/lorem.txt'), 'file not emptied');
+		$this->assertEquals('', $this->instance->file_get_contents('/lorem.txt'), 'file not emptied');
 	}
 
 	/**
 	 * test various known mimetypes
 	 */
 	public function testMimeType() {
-		$this->assertEqual('httpd/unix-directory', $this->instance->getMimeType('/'));
-		$this->assertEqual(false, $this->instance->getMimeType('/non/existing/file'));
+		$this->assertEquals('httpd/unix-directory', $this->instance->getMimeType('/'));
+		$this->assertEquals(false, $this->instance->getMimeType('/non/existing/file'));
 
 		$textFile = OC::$SERVERROOT . '/tests/data/lorem.txt';
 		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile, 'r'));
-		$this->assertEqual('text/plain', $this->instance->getMimeType('/lorem.txt'));
+		$this->assertEquals('text/plain', $this->instance->getMimeType('/lorem.txt'));
 
 		$pngFile = OC::$SERVERROOT . '/tests/data/logo-wide.png';
 		$this->instance->file_put_contents('/logo-wide.png', file_get_contents($pngFile, 'r'));
-		$this->assertEqual('image/png', $this->instance->getMimeType('/logo-wide.png'));
+		$this->assertEquals('image/png', $this->instance->getMimeType('/logo-wide.png'));
 
 		$svgFile = OC::$SERVERROOT . '/tests/data/logo-wide.svg';
 		$this->instance->file_put_contents('/logo-wide.svg', file_get_contents($svgFile, 'r'));
-		$this->assertEqual('image/svg+xml', $this->instance->getMimeType('/logo-wide.svg'));
+		$this->assertEquals('image/svg+xml', $this->instance->getMimeType('/logo-wide.svg'));
 	}
 
 	public function testCopyAndMove() {
@@ -121,12 +121,12 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->instance->file_put_contents('/source.txt', file_get_contents($textFile));
 		$this->instance->copy('/source.txt', '/target.txt');
 		$this->assertTrue($this->instance->file_exists('/target.txt'));
-		$this->assertEqual($this->instance->file_get_contents('/source.txt'), $this->instance->file_get_contents('/target.txt'));
+		$this->assertEquals($this->instance->file_get_contents('/source.txt'), $this->instance->file_get_contents('/target.txt'));
 
 		$this->instance->rename('/source.txt', '/target2.txt');
 		$this->assertTrue($this->instance->file_exists('/target2.txt'));
 		$this->assertFalse($this->instance->file_exists('/source.txt'));
-		$this->assertEqual(file_get_contents($textFile), $this->instance->file_get_contents('/target.txt'));
+		$this->assertEquals(file_get_contents($textFile), $this->instance->file_get_contents('/target.txt'));
 	}
 
 	public function testLocal() {
@@ -134,7 +134,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->instance->file_put_contents('/lorem.txt', file_get_contents($textFile));
 		$localFile = $this->instance->getLocalFile('/lorem.txt');
 		$this->assertTrue(file_exists($localFile));
-		$this->assertEqual(file_get_contents($localFile), file_get_contents($textFile));
+		$this->assertEquals(file_get_contents($localFile), file_get_contents($textFile));
 
 		$this->instance->mkdir('/folder');
 		$this->instance->file_put_contents('/folder/lorem.txt', file_get_contents($textFile));
@@ -145,9 +145,9 @@ abstract class Test_FileStorage extends UnitTestCase {
 
 		$this->assertTrue(is_dir($localFolder));
 		$this->assertTrue(file_exists($localFolder . '/lorem.txt'));
-		$this->assertEqual(file_get_contents($localFolder . '/lorem.txt'), file_get_contents($textFile));
-		$this->assertEqual(file_get_contents($localFolder . '/bar.txt'), 'asd');
-		$this->assertEqual(file_get_contents($localFolder . '/recursive/file.txt'), 'foo');
+		$this->assertEquals(file_get_contents($localFolder . '/lorem.txt'), file_get_contents($textFile));
+		$this->assertEquals(file_get_contents($localFolder . '/bar.txt'), 'asd');
+		$this->assertEquals(file_get_contents($localFolder . '/recursive/file.txt'), 'foo');
 	}
 
 	public function testStat() {
@@ -162,12 +162,12 @@ abstract class Test_FileStorage extends UnitTestCase {
 
 		$this->assertTrue(($ctimeStart - 1) <= $mTime);
 		$this->assertTrue($mTime <= ($ctimeEnd + 1));
-		$this->assertEqual(filesize($textFile), $this->instance->filesize('/lorem.txt'));
+		$this->assertEquals(filesize($textFile), $this->instance->filesize('/lorem.txt'));
 
 		$stat = $this->instance->stat('/lorem.txt');
 		//only size and mtime are requered in the result
-		$this->assertEqual($stat['size'], $this->instance->filesize('/lorem.txt'));
-		$this->assertEqual($stat['mtime'], $mTime);
+		$this->assertEquals($stat['size'], $this->instance->filesize('/lorem.txt'));
+		$this->assertEquals($stat['mtime'], $mTime);
 
 		$mtimeStart = time();
 		$supportsTouch = $this->instance->touch('/lorem.txt');
@@ -181,7 +181,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 
 			if ($this->instance->touch('/lorem.txt', 100) !== false) {
 				$mTime = $this->instance->filemtime('/lorem.txt');
-				$this->assertEqual($mTime, 100);
+				$this->assertEquals($mTime, 100);
 			}
 		}
 
@@ -207,7 +207,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$svgFile = OC::$SERVERROOT . '/tests/data/logo-wide.svg';
 		$this->instance->file_put_contents('/logo-wide.svg', file_get_contents($svgFile, 'r'));
 		$result = $this->instance->search('logo');
-		$this->assertEqual(2, count($result));
+		$this->assertEquals(2, count($result));
 		$this->assertContains('/logo-wide.svg', $result);
 		$this->assertContains('/logo-wide.png', $result);
 	}
@@ -229,6 +229,6 @@ abstract class Test_FileStorage extends UnitTestCase {
 
 		$fh = $this->instance->fopen('foo', 'r');
 		$content = stream_get_contents($fh);
-		$this->assertEqual(file_get_contents($textFile), $content);
+		$this->assertEquals(file_get_contents($textFile), $content);
 	}
 }
diff --git a/tests/lib/filestorage/commontest.php b/tests/lib/filestorage/commontest.php
index 89e83589e5db2ee8851b2ed5b713f2946c976134..6719fcff4e871fd1f8ec4fb75f4818ac7f304df0 100644
--- a/tests/lib/filestorage/commontest.php
+++ b/tests/lib/filestorage/commontest.php
@@ -38,4 +38,3 @@ class Test_Filestorage_CommonTest extends Test_FileStorage {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/tests/lib/filestorage/local.php b/tests/lib/filestorage/local.php
index f68fb69b97fe4c0b3c75e3e6e2220b1f97b97834..d7d71e8f3728b9afc614c89c7475f5c780946413 100644
--- a/tests/lib/filestorage/local.php
+++ b/tests/lib/filestorage/local.php
@@ -35,4 +35,3 @@ class Test_Filestorage_Local extends Test_FileStorage {
 	}
 }
 
-?>
\ No newline at end of file
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 5cced4946d9b9aba4738eaf18cefd3f15ebce990..ee31ef4364d3d716e9c2ca2ebbf0e8be6584b0a1 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -20,7 +20,7 @@
  *
  */
 
-class Test_Filesystem extends UnitTestCase {
+class Test_Filesystem extends PHPUnit_Framework_TestCase {
 	/**
 	 * @var array tmpDirs
 	 */
@@ -47,28 +47,28 @@ class Test_Filesystem extends UnitTestCase {
 
 	public function testMount() {
 		OC_Filesystem::mount('OC_Filestorage_Local', self::getStorageData(), '/');
-		$this->assertEqual('/', OC_Filesystem::getMountPoint('/'));
-		$this->assertEqual('/', OC_Filesystem::getMountPoint('/some/folder'));
-		$this->assertEqual('', OC_Filesystem::getInternalPath('/'));
-		$this->assertEqual('some/folder', OC_Filesystem::getInternalPath('/some/folder'));
+		$this->assertEquals('/', OC_Filesystem::getMountPoint('/'));
+		$this->assertEquals('/', OC_Filesystem::getMountPoint('/some/folder'));
+		$this->assertEquals('', OC_Filesystem::getInternalPath('/'));
+		$this->assertEquals('some/folder', OC_Filesystem::getInternalPath('/some/folder'));
 
 		OC_Filesystem::mount('OC_Filestorage_Local', self::getStorageData(), '/some');
-		$this->assertEqual('/', OC_Filesystem::getMountPoint('/'));
-		$this->assertEqual('/some/', OC_Filesystem::getMountPoint('/some/folder'));
-		$this->assertEqual('/some/', OC_Filesystem::getMountPoint('/some/'));
-		$this->assertEqual('/', OC_Filesystem::getMountPoint('/some'));
-		$this->assertEqual('folder', OC_Filesystem::getInternalPath('/some/folder'));
+		$this->assertEquals('/', OC_Filesystem::getMountPoint('/'));
+		$this->assertEquals('/some/', OC_Filesystem::getMountPoint('/some/folder'));
+		$this->assertEquals('/some/', OC_Filesystem::getMountPoint('/some/'));
+		$this->assertEquals('/', OC_Filesystem::getMountPoint('/some'));
+		$this->assertEquals('folder', OC_Filesystem::getInternalPath('/some/folder'));
 	}
 
 	public function testNormalize() {
-		$this->assertEqual('/path', OC_Filesystem::normalizePath('/path/'));
-		$this->assertEqual('/path/', OC_Filesystem::normalizePath('/path/', false));
-		$this->assertEqual('/path', OC_Filesystem::normalizePath('path'));
-		$this->assertEqual('/path', OC_Filesystem::normalizePath('\path'));
-		$this->assertEqual('/foo/bar', OC_Filesystem::normalizePath('/foo//bar/'));
-		$this->assertEqual('/foo/bar', OC_Filesystem::normalizePath('/foo////bar'));
+		$this->assertEquals('/path', OC_Filesystem::normalizePath('/path/'));
+		$this->assertEquals('/path/', OC_Filesystem::normalizePath('/path/', false));
+		$this->assertEquals('/path', OC_Filesystem::normalizePath('path'));
+		$this->assertEquals('/path', OC_Filesystem::normalizePath('\path'));
+		$this->assertEquals('/foo/bar', OC_Filesystem::normalizePath('/foo//bar/'));
+		$this->assertEquals('/foo/bar', OC_Filesystem::normalizePath('/foo////bar'));
 		if (class_exists('Normalizer')) {
-			$this->assertEqual("/foo/bar\xC3\xBC", OC_Filesystem::normalizePath("/foo/baru\xCC\x88"));
+			$this->assertEquals("/foo/bar\xC3\xBC", OC_Filesystem::normalizePath("/foo/baru\xCC\x88"));
 		}
 	}
 
@@ -100,10 +100,10 @@ class Test_Filesystem extends UnitTestCase {
 		$rootView->mkdir('/' . $user);
 		$rootView->mkdir('/' . $user . '/files');
 
-		$this->assertFalse($rootView->file_put_contents('/.htaccess', 'foo'));
-		$this->assertFalse(OC_Filesystem::file_put_contents('/.htaccess', 'foo'));
+		$this->assertFalse((bool)$rootView->file_put_contents('/.htaccess', 'foo'));
+		$this->assertFalse((bool)OC_Filesystem::file_put_contents('/.htaccess', 'foo'));
 		$fh = fopen(__FILE__, 'r');
-		$this->assertFalse(OC_Filesystem::file_put_contents('/.htaccess', $fh));
+		$this->assertFalse((bool)OC_Filesystem::file_put_contents('/.htaccess', $fh));
 	}
 
 	public function testHooks() {
@@ -134,6 +134,6 @@ class Test_Filesystem extends UnitTestCase {
 
 	public function dummyHook($arguments) {
 		$path = $arguments['path'];
-		$this->assertEqual($path, OC_Filesystem::normalizePath($path)); //the path passed to the hook should already be normalized
+		$this->assertEquals($path, OC_Filesystem::normalizePath($path)); //the path passed to the hook should already be normalized
 	}
 }
diff --git a/tests/lib/geo.php b/tests/lib/geo.php
index d4951ee79e79bbe16862536019418cd1b1ec1d44..82e6160868770c250134f10dbcf78d2da1ce15a0 100644
--- a/tests/lib/geo.php
+++ b/tests/lib/geo.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Geo extends UnitTestCase {
+class Test_Geo extends PHPUnit_Framework_TestCase {
 	function testTimezone() {
 		$result = OC_Geo::timezone(3, 3);
 		$expected = 'Africa/Porto-Novo';
diff --git a/tests/lib/group.php b/tests/lib/group.php
index 28264b0f168c060e9d8269c415d1400fc667f5d6..9128bd7ddce741b3c6f4a5b6f31b5f90213c55e1 100644
--- a/tests/lib/group.php
+++ b/tests/lib/group.php
@@ -22,7 +22,7 @@
 *
 */
 
-class Test_Group extends UnitTestCase {
+class Test_Group extends PHPUnit_Framework_TestCase {
 	function setUp() {
 		OC_Group::clearBackends();
 	}
@@ -43,24 +43,24 @@ class Test_Group extends UnitTestCase {
 		$this->assertFalse(OC_Group::inGroup($user1, $group2));
 		$this->assertFalse(OC_Group::inGroup($user2, $group2));
 
-		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
+		$this->assertTrue((bool)OC_Group::addToGroup($user1, $group1));
 
 		$this->assertTrue(OC_Group::inGroup($user1, $group1));
 		$this->assertFalse(OC_Group::inGroup($user2, $group1));
 		$this->assertFalse(OC_Group::inGroup($user1, $group2));
 		$this->assertFalse(OC_Group::inGroup($user2, $group2));
 
-		$this->assertFalse(OC_Group::addToGroup($user1, $group1));
+		$this->assertFalse((bool)OC_Group::addToGroup($user1, $group1));
 
-		$this->assertEqual(array($user1), OC_Group::usersInGroup($group1));
-		$this->assertEqual(array(), OC_Group::usersInGroup($group2));
+		$this->assertEquals(array($user1), OC_Group::usersInGroup($group1));
+		$this->assertEquals(array(), OC_Group::usersInGroup($group2));
 
-		$this->assertEqual(array($group1), OC_Group::getUserGroups($user1));
-		$this->assertEqual(array(), OC_Group::getUserGroups($user2));
+		$this->assertEquals(array($group1), OC_Group::getUserGroups($user1));
+		$this->assertEquals(array(), OC_Group::getUserGroups($user2));
 
 		OC_Group::deleteGroup($group1);
-		$this->assertEqual(array(), OC_Group::getUserGroups($user1));
-		$this->assertEqual(array(), OC_Group::usersInGroup($group1));
+		$this->assertEquals(array(), OC_Group::getUserGroups($user1));
+		$this->assertEquals(array(), OC_Group::usersInGroup($group1));
 		$this->assertFalse(OC_Group::inGroup($user1, $group1));
 	}
 
@@ -69,7 +69,7 @@ class Test_Group extends UnitTestCase {
 		OC_Group::useBackend(new OC_Group_Dummy());
 		$emptyGroup = null;
 
-		$this->assertEqual(false, OC_Group::createGroup($emptyGroup));
+		$this->assertEquals(false, OC_Group::createGroup($emptyGroup));
 	}
 
 
@@ -80,8 +80,8 @@ class Test_Group extends UnitTestCase {
 
 		$groupCopy = $group;
 
-		$this->assertEqual(false, OC_Group::createGroup($groupCopy));
-		$this->assertEqual(array($group), OC_Group::getGroups());
+		$this->assertEquals(false, OC_Group::createGroup($groupCopy));
+		$this->assertEquals(array($group), OC_Group::getGroups());
 	}
 
 
@@ -90,8 +90,8 @@ class Test_Group extends UnitTestCase {
 		$adminGroup = 'admin';
 		OC_Group::createGroup($adminGroup);
 
-		$this->assertEqual(false, OC_Group::deleteGroup($adminGroup));
-		$this->assertEqual(array($adminGroup), OC_Group::getGroups());	
+		$this->assertEquals(false, OC_Group::deleteGroup($adminGroup));
+		$this->assertEquals(array($adminGroup), OC_Group::getGroups());
 	}
 
 
@@ -100,8 +100,8 @@ class Test_Group extends UnitTestCase {
 		$groupNonExistent = 'notExistent';
 		$user = uniqid();
 
-		$this->assertEqual(false, OC_Group::addToGroup($user, $groupNonExistent));
-		$this->assertEqual(array(), OC_Group::getGroups());
+		$this->assertEquals(false, OC_Group::addToGroup($user, $groupNonExistent));
+		$this->assertEquals(array(), OC_Group::getGroups());
 	}
 
 
@@ -122,7 +122,7 @@ class Test_Group extends UnitTestCase {
 		OC_Group::addToGroup($user3, $group1);
 		OC_Group::addToGroup($user3, $group2);
 
-		$this->assertEqual(array($user1, $user2, $user3), 
+		$this->assertEquals(array($user1, $user2, $user3),
 					OC_Group::usersInGroups(array($group1, $group2, $group3)));
 
 		// FIXME: needs more parameter variation
@@ -141,16 +141,16 @@ class Test_Group extends UnitTestCase {
 		OC_Group::createGroup($group1);
 
 		//groups should be added to the first registered backend
-		$this->assertEqual(array($group1), $backend1->getGroups());
-		$this->assertEqual(array(), $backend2->getGroups());
+		$this->assertEquals(array($group1), $backend1->getGroups());
+		$this->assertEquals(array(), $backend2->getGroups());
 
-		$this->assertEqual(array($group1), OC_Group::getGroups());
+		$this->assertEquals(array($group1), OC_Group::getGroups());
 		$this->assertTrue(OC_Group::groupExists($group1));
 		$this->assertFalse(OC_Group::groupExists($group2));
 
 		$backend1->createGroup($group2);
 
-		$this->assertEqual(array($group1, $group2), OC_Group::getGroups());
+		$this->assertEquals(array($group1, $group2), OC_Group::getGroups());
 		$this->assertTrue(OC_Group::groupExists($group1));
 		$this->assertTrue(OC_Group::groupExists($group2));
 
@@ -161,22 +161,22 @@ class Test_Group extends UnitTestCase {
 		$this->assertFalse(OC_Group::inGroup($user2, $group1));
 
 
-		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
+		$this->assertTrue((bool)OC_Group::addToGroup($user1, $group1));
 
 		$this->assertTrue(OC_Group::inGroup($user1, $group1));
 		$this->assertFalse(OC_Group::inGroup($user2, $group1));
 		$this->assertFalse($backend2->inGroup($user1, $group1));
 
-		$this->assertFalse(OC_Group::addToGroup($user1, $group1));
+		$this->assertFalse((bool)OC_Group::addToGroup($user1, $group1));
 
-		$this->assertEqual(array($user1), OC_Group::usersInGroup($group1));
+		$this->assertEquals(array($user1), OC_Group::usersInGroup($group1));
 
-		$this->assertEqual(array($group1), OC_Group::getUserGroups($user1));
-		$this->assertEqual(array(), OC_Group::getUserGroups($user2));
+		$this->assertEquals(array($group1), OC_Group::getUserGroups($user1));
+		$this->assertEquals(array(), OC_Group::getUserGroups($user2));
 
 		OC_Group::deleteGroup($group1);
-		$this->assertEqual(array(), OC_Group::getUserGroups($user1));
-		$this->assertEqual(array(), OC_Group::usersInGroup($group1));
+		$this->assertEquals(array(), OC_Group::getUserGroups($user1));
+		$this->assertEquals(array(), OC_Group::usersInGroup($group1));
 		$this->assertFalse(OC_Group::inGroup($user1, $group1));
 	}
 }
diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php
index f61abed5f297fa1ee111319be94338e5ac9f9c02..d308232a78b5ed5a991d7091ddf28169c8357cbd 100644
--- a/tests/lib/group/backend.php
+++ b/tests/lib/group/backend.php
@@ -20,7 +20,7 @@
 *
 */
 
-abstract class Test_Group_Backend extends UnitTestCase {
+abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
 	/**
 	 * @var OC_Group_Backend $backend
 	 */
@@ -52,18 +52,18 @@ abstract class Test_Group_Backend extends UnitTestCase {
 		$name2=$this->getGroupName();
 		$this->backend->createGroup($name1);
 		$count=count($this->backend->getGroups())-$startCount;
-		$this->assertEqual(1, $count);
+		$this->assertEquals(1, $count);
 		$this->assertTrue((array_search($name1, $this->backend->getGroups())!==false));
 		$this->assertFalse((array_search($name2, $this->backend->getGroups())!==false));
 		$this->backend->createGroup($name2);
 		$count=count($this->backend->getGroups())-$startCount;
-		$this->assertEqual(2, $count);
+		$this->assertEquals(2, $count);
 		$this->assertTrue((array_search($name1, $this->backend->getGroups())!==false));
 		$this->assertTrue((array_search($name2, $this->backend->getGroups())!==false));
 
 		$this->backend->deleteGroup($name2);
 		$count=count($this->backend->getGroups())-$startCount;
-		$this->assertEqual(1, $count);
+		$this->assertEquals(1, $count);
 		$this->assertTrue((array_search($name1, $this->backend->getGroups())!==false));
 		$this->assertFalse((array_search($name2, $this->backend->getGroups())!==false));
 	}
@@ -91,15 +91,15 @@ abstract class Test_Group_Backend extends UnitTestCase {
 		
 		$this->assertFalse($this->backend->addToGroup($user1, $group1));
 
-		$this->assertEqual(array($user1), $this->backend->usersInGroup($group1));
-		$this->assertEqual(array(), $this->backend->usersInGroup($group2));
+		$this->assertEquals(array($user1), $this->backend->usersInGroup($group1));
+		$this->assertEquals(array(), $this->backend->usersInGroup($group2));
 
-		$this->assertEqual(array($group1), $this->backend->getUserGroups($user1));
-		$this->assertEqual(array(), $this->backend->getUserGroups($user2));
+		$this->assertEquals(array($group1), $this->backend->getUserGroups($user1));
+		$this->assertEquals(array(), $this->backend->getUserGroups($user2));
 
 		$this->backend->deleteGroup($group1);
-		$this->assertEqual(array(), $this->backend->getUserGroups($user1));
-		$this->assertEqual(array(), $this->backend->usersInGroup($group1));
+		$this->assertEquals(array(), $this->backend->getUserGroups($user1));
+		$this->assertEquals(array(), $this->backend->usersInGroup($group1));
 		$this->assertFalse($this->backend->inGroup($user1, $group1));
 	}
 }
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index cfb9a7995795f0611e5b4d276e85c2716302c91f..336e8f8b3c5ccf90bec70aa37efb644d188e118a 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Helper extends UnitTestCase {
+class Test_Helper extends PHPUnit_Framework_TestCase {
 
 	function testHumanFileSize() {
 		$result = OC_Helper::humanFileSize(0);
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 92f5d065cf26fb7c1bb2703f74a2244d96721420..ab43e47726b9977515213669a58f2db5cc5a17a6 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class Test_Share extends UnitTestCase {
+class Test_Share extends PHPUnit_Framework_TestCase {
 
 	protected $itemType;
 	protected $userBackend;
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 89b2785fca6e705bb776d72ea5597f0315dfdfbc..aebbc93b9024a36ecf46dce5affac4bb768c2c9c 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -20,7 +20,7 @@
 *
 */
 
-class Test_StreamWrappers extends UnitTestCase {
+class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
 	public function testFakeDir() {
 		$items=array('foo', 'bar');
 		OC_FakeDirStream::$dirs['test']=$items;
@@ -30,7 +30,7 @@ class Test_StreamWrappers extends UnitTestCase {
 			$result[]=$file;
 			$this->assertContains($file, $items);
 		}
-		$this->assertEqual(count($items), count($result));
+		$this->assertEquals(count($items), count($result));
 	}
 
 	public function testStaticStream() {
@@ -39,7 +39,7 @@ class Test_StreamWrappers extends UnitTestCase {
 		$this->assertFalse(file_exists($staticFile));
 		file_put_contents($staticFile, file_get_contents($sourceFile));
 		$this->assertTrue(file_exists($staticFile));
-		$this->assertEqual(file_get_contents($sourceFile), file_get_contents($staticFile));
+		$this->assertEquals(file_get_contents($sourceFile), file_get_contents($staticFile));
 		unlink($staticFile);
 		clearstatcache();
 		$this->assertFalse(file_exists($staticFile));
@@ -52,7 +52,7 @@ class Test_StreamWrappers extends UnitTestCase {
 		$file='close://'.$tmpFile;
 		$this->assertTrue(file_exists($file));
 		file_put_contents($file, file_get_contents($sourceFile));
-		$this->assertEqual(file_get_contents($sourceFile), file_get_contents($file));
+		$this->assertEquals(file_get_contents($sourceFile), file_get_contents($file));
 		unlink($file);
 		clearstatcache();
 		$this->assertFalse(file_exists($file));
@@ -68,7 +68,7 @@ class Test_StreamWrappers extends UnitTestCase {
 			$this->fail('Expected exception');
 		}catch(Exception $e) {
 			$path=$e->getMessage();
-			$this->assertEqual($path, $tmpFile);
+			$this->assertEquals($path, $tmpFile);
 		}
 	}
 
diff --git a/tests/lib/template.php b/tests/lib/template.php
index 736bc95255c05824a1a810cf0d799f057475a201..6e88d4c07fc0218479a19fd2696159169080f40a 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -22,7 +22,7 @@
 
 OC::autoload('OC_Template');
 
-class Test_TemplateFunctions extends UnitTestCase {
+class Test_TemplateFunctions extends PHPUnit_Framework_TestCase {
 
 	public function testP() {
 		// FIXME: do we need more testcases?
@@ -30,9 +30,8 @@ class Test_TemplateFunctions extends UnitTestCase {
 		ob_start();
 		p($htmlString);
 		$result = ob_get_clean();
-		ob_end_clean();
 
-		$this->assertEqual("&lt;script&gt;alert(&#039;xss&#039;);&lt;/script&gt;", $result);
+		$this->assertEquals("&lt;script&gt;alert(&#039;xss&#039;);&lt;/script&gt;", $result);
 	}
 
 	public function testPNormalString() {
@@ -40,9 +39,8 @@ class Test_TemplateFunctions extends UnitTestCase {
 		ob_start();
 		p($normalString);
 		$result = ob_get_clean();
-		ob_end_clean();
 
-		$this->assertEqual("This is a good string!", $result);
+		$this->assertEquals("This is a good string!", $result);
 	}
 
 
@@ -52,9 +50,8 @@ class Test_TemplateFunctions extends UnitTestCase {
 		ob_start();
 		print_unescaped($htmlString);
 		$result = ob_get_clean();
-		ob_end_clean();
 
-		$this->assertEqual($htmlString, $result);
+		$this->assertEquals($htmlString, $result);
 	}
 
 	public function testPrintUnescapedNormalString() {
@@ -62,9 +59,8 @@ class Test_TemplateFunctions extends UnitTestCase {
 		ob_start();
 		print_unescaped($normalString);
 		$result = ob_get_clean();
-		ob_end_clean();
 
-		$this->assertEqual("This is a good string!", $result);
+		$this->assertEquals("This is a good string!", $result);
 	}
 
 
diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php
index 0b744770ea28faea45f37e119b54af509179e2a1..40674424c96efb918f0c518532566122a4c60e80 100644
--- a/tests/lib/user/backend.php
+++ b/tests/lib/user/backend.php
@@ -30,7 +30,7 @@
  * For an example see /tests/lib/user/dummy.php
  */
 
-abstract class Test_User_Backend extends UnitTestCase {
+abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
 	/**
 	 * @var OC_User_Backend $backend
 	 */
@@ -53,18 +53,18 @@ abstract class Test_User_Backend extends UnitTestCase {
 		$name2=$this->getUser();
 		$this->backend->createUser($name1, '');
 		$count=count($this->backend->getUsers())-$startCount;
-		$this->assertEqual(1, $count);
+		$this->assertEquals(1, $count);
 		$this->assertTrue((array_search($name1, $this->backend->getUsers())!==false));
 		$this->assertFalse((array_search($name2, $this->backend->getUsers())!==false));
 		$this->backend->createUser($name2, '');
 		$count=count($this->backend->getUsers())-$startCount;
-		$this->assertEqual(2, $count);
+		$this->assertEquals(2, $count);
 		$this->assertTrue((array_search($name1, $this->backend->getUsers())!==false));
 		$this->assertTrue((array_search($name2, $this->backend->getUsers())!==false));
 
 		$this->backend->deleteUser($name2);
 		$count=count($this->backend->getUsers())-$startCount;
-		$this->assertEqual(1, $count);
+		$this->assertEquals(1, $count);
 		$this->assertTrue((array_search($name1, $this->backend->getUsers())!==false));
 		$this->assertFalse((array_search($name2, $this->backend->getUsers())!==false));
 	}
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 27635cb805558cf3b46130c7f1ace9a3e0cd9c47..ebff3c7381a2fb7f679140e392599b6f396de6d5 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Util extends UnitTestCase {
+class Test_Util extends PHPUnit_Framework_TestCase {
 
 	// Constructor
 	function Test_Util() {
diff --git a/tests/lib/vcategories.php b/tests/lib/vcategories.php
index 63516a063daa62f4cbe37f7054ef9626c0153546..e79dd49870c89f33b5ef1f309b5a5cc41c5d4233 100644
--- a/tests/lib/vcategories.php
+++ b/tests/lib/vcategories.php
@@ -22,7 +22,7 @@
 
 //require_once("../lib/template.php");
 
-class Test_VCategories extends UnitTestCase {
+class Test_VCategories extends PHPUnit_Framework_TestCase {
 
 	protected $objectType;
 	protected $user;
@@ -49,7 +49,7 @@ class Test_VCategories extends UnitTestCase {
 
 		$catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
 
-		$this->assertEqual(4, count($catmgr->categories()));
+		$this->assertEquals(4, count($catmgr->categories()));
 	}
 
 	public function testAddCategories() {
@@ -59,25 +59,25 @@ class Test_VCategories extends UnitTestCase {
 
 		foreach($categories as $category) {
 			$result = $catmgr->add($category);
-			$this->assertTrue($result);
+			$this->assertTrue((bool)$result);
 		}
 
 		$this->assertFalse($catmgr->add('Family'));
 		$this->assertFalse($catmgr->add('fAMILY'));
 
-		$this->assertEqual(4, count($catmgr->categories()));
+		$this->assertEquals(4, count($catmgr->categories()));
 	}
 
 	public function testdeleteCategories() {
 		$defcategories = array('Friends', 'Family', 'Work', 'Other');
 		$catmgr = new OC_VCategories($this->objectType, $this->user, $defcategories);
-		$this->assertEqual(4, count($catmgr->categories()));
+		$this->assertEquals(4, count($catmgr->categories()));
 
 		$catmgr->delete('family');
-		$this->assertEqual(3, count($catmgr->categories()));
+		$this->assertEquals(3, count($catmgr->categories()));
 
 		$catmgr->delete(array('Friends', 'Work', 'Other'));
-		$this->assertEqual(0, count($catmgr->categories()));
+		$this->assertEquals(0, count($catmgr->categories()));
 
 	}
 
@@ -90,8 +90,8 @@ class Test_VCategories extends UnitTestCase {
 			$catmgr->addToCategory($id, 'Family');
 		}
 
-		$this->assertEqual(1, count($catmgr->categories()));
-		$this->assertEqual(9, count($catmgr->idsForCategory('Family')));
+		$this->assertEquals(1, count($catmgr->categories()));
+		$this->assertEquals(9, count($catmgr->idsForCategory('Family')));
 	}
 
 	/**
@@ -110,8 +110,8 @@ class Test_VCategories extends UnitTestCase {
 			$this->assertFalse(in_array($id, $catmgr->idsForCategory('Family')));
 		}
 
-		$this->assertEqual(1, count($catmgr->categories()));
-		$this->assertEqual(0, count($catmgr->idsForCategory('Family')));
+		$this->assertEquals(1, count($catmgr->categories()));
+		$this->assertEquals(0, count($catmgr->idsForCategory('Family')));
 	}
 
 }
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 23cd123edc67cabcf26882e400aca784144fd37d..f5a686c3020688512d2dc84bd0094088f472c2ad 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -11,4 +11,7 @@
 			<directory suffix=".php">../3rdparty</directory>
 		</exclude>
 	</whitelist>
+	<listeners>
+		<listener class="PHPUnit_Util_Log_JSON"></listener>
+	</listeners>
 </phpunit>